AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

printing: Don't hang in gtk_enumerate_printers()

Browse Source 
Stop enumerating printers when all backends were removed.

https://bugzilla.gnome.org/show_bug.cgi?id=686838
This commit is contained in:
Marek Kasik 2014-03-26 12:29:46 +01:00
parent 26262505f2
commit 04c6811c3d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkprinter.c
View File

@ -1146,7 +1146,7 @@ backend_status_changed (GObject *object,
list_done_cb (backend, printer_list);
}
static void
static gboolean
list_printers_remove_backend (PrinterList *printer_list,
GtkPrintBackend *backend)
{
@ -1155,7 +1155,12 @@ list_printers_remove_backend (PrinterList *printer_list,
g_object_unref (backend);
if (printer_list->backends == NULL)
free_printer_list (printer_list);
{
free_printer_list (printer_list);
return TRUE;
}
return FALSE;
}
static void
@ -1193,7 +1198,10 @@ list_printers_init (PrinterList *printer_list,
if (status == GTK_PRINT_BACKEND_STATUS_UNAVAILABLE ||
gtk_print_backend_printer_list_is_done (backend))
list_printers_remove_backend(printer_list, backend);
{
if (list_printers_remove_backend (printer_list, backend))
return TRUE;
}
else
{
g_signal_connect (backend, "printer-added",