AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 11:07:38 +00:00
Code Issues Projects Releases Wiki Activity

printing: Make sure destroy function is always called by gtk_enumerate_printers

Browse Source 
When GtkPrinterFunc always returns FALSE, for example when looking for
a non existent printer, if print list is done for all backends or print
backend status is UNAVAILABLE, gtk_enumerate_printers() finishes with an
empty backend list and destroy function is never called. We need to
check the backend list again after calling list_printers_init for all
backends and finish the enumeration if it's empty.

https://bugzilla.gnome.org/show_bug.cgi?id=672125
This commit is contained in:
Carlos Garcia Campos 2012-03-15 12:10:52 +01:00 committed by Carlos Garcia Campos
parent 51fb0419c2
commit 9a0e81380b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkprinter.c
View File

@ -1137,15 +1137,10 @@ backend_status_changed (GObject *object,
}
static void
list_done_cb (GtkPrintBackend *backend,
PrinterList *printer_list)
list_printers_remove_backend (PrinterList *printer_list,
GtkPrintBackend *backend)
{
printer_list->backends = g_list_remove (printer_list->backends, backend);
g_signal_handlers_disconnect_by_func (backend, list_added_cb, printer_list);
g_signal_handlers_disconnect_by_func (backend, list_done_cb, printer_list);
g_signal_handlers_disconnect_by_func (backend, backend_status_changed, printer_list);
gtk_print_backend_destroy (backend);
g_object_unref (backend);
@ -1153,6 +1148,17 @@ list_done_cb (GtkPrintBackend *backend,
free_printer_list (printer_list);
}
static void
list_done_cb (GtkPrintBackend *backend,
PrinterList *printer_list)
{
g_signal_handlers_disconnect_by_func (backend, list_added_cb, printer_list);
g_signal_handlers_disconnect_by_func (backend, list_done_cb, printer_list);
g_signal_handlers_disconnect_by_func (backend, backend_status_changed, printer_list);
list_printers_remove_backend(printer_list, backend);
}
static gboolean
list_printers_init (PrinterList *printer_list,
GtkPrintBackend *backend)
@ -1177,11 +1183,7 @@ list_printers_init (PrinterList *printer_list,
if (status == GTK_PRINT_BACKEND_STATUS_UNAVAILABLE ||
gtk_print_backend_printer_list_is_done (backend))
{
printer_list->backends = g_list_remove (printer_list->backends, backend);
gtk_print_backend_destroy (backend);
g_object_unref (backend);
}
list_printers_remove_backend(printer_list, backend);
else
{
g_signal_connect (backend, "printer-added",