diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c index a38be43960..479b8c757f 100644 --- a/gtk/gtkprinter.c +++ b/gtk/gtkprinter.c @@ -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",