Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

print portal: Report errors properly

Browse Source 
The portal printoperation inmplementation
relies on the file printbackend to be available.
If it isn't, we should report a proper error
status insetad of running into assertions deep
inside the printoperation code.
This commit is contained in:
Matthias Clasen
2023-09-27 17:25:42 -04:00
parent 741471a1f8
commit 789705cfe4
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/print/gtkprintoperation-portal.c
View File

@@ -384,6 +384,8 @@ find_file_printer (void)
for (l = backends; l; l = l->next)
{
GtkPrintBackend *backend = l->data;
/* FIXME: this needs changes for cpdb */
if (strcmp (G_OBJECT_TYPE_NAME (backend), "GtkPrintBackendFile") == 0)
{
printers = gtk_print_backend_get_printer_list (backend);
@@ -427,11 +429,6 @@ prepare_print_response (GDBusConnection *connection,
GtkPrintSettings *settings;
GtkPageSetup *page_setup;
GtkPrinter *printer;
char *filename;
char *uri;
int fd;
portal->result = GTK_PRINT_OPERATION_RESULT_APPLY;
v = g_variant_lookup_value (options, "settings", G_VARIANT_TYPE_VARDICT);
settings = gtk_print_settings_new_from_gvariant (v);
@@ -444,15 +441,28 @@ prepare_print_response (GDBusConnection *connection,
g_variant_lookup (options, "token", "u", &portal->token);
printer = find_file_printer ();
if (printer)
{
char *filename;
int fd;
char *uri;
fd = g_file_open_tmp ("gtkprintXXXXXX", &filename, NULL);
uri = g_filename_to_uri (filename, NULL, NULL);
gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
g_free (uri);
close (fd);
fd = g_file_open_tmp ("gtkprintXXXXXX", &filename, NULL);
uri = g_filename_to_uri (filename, NULL, NULL);
gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
g_free (uri);
close (fd);
finish_print (portal, printer, page_setup, settings);
g_free (filename);
finish_print (portal, printer, page_setup, settings);
g_free (filename);
portal->result = GTK_PRINT_OPERATION_RESULT_APPLY;
}
else
{
portal->do_print = FALSE;
portal->result = GTK_PRINT_OPERATION_RESULT_ERROR;
}
}
else
{