Send printer-list-done on error.

2006-08-31  Matthias Clasen  <mclasen@redhat.com>

	* modules/printbackends/cups/gtkprintbackendcups.c (cups_request_printer_list_cb): Send printer-list-done on error.

diff --git a/ChangeLog b/ChangeLog
index 815d155d640adbc350fea789b90a0b682977f388..671ab0e6ef13d29a770280c4a771409c42eee82b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-31  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/printbackends/cups/gtkprintbackendcups.c (cups_request_printer_list_cb): Send printer-list-done on error.
+
 2006-08-31  Michael Natterer  <mitch@imendio.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_beep): Fix build.

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 3f5255ee537e69b74bdd1b3910191a41f671d716..53ff1e581dc96990710f5d9d893661646e95f7ca 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -965,7 +965,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
   if (gtk_cups_result_is_error (result))
     {
       g_warning ("Error getting printer list: %s", gtk_cups_result_get_error_string (result));
-      return;
+
+      goto done;
     }
   
   /* Gather the names of the printers in the current queue
@@ -1134,6 +1135,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
       list_has_changed = TRUE;
     }
   
+done:
   if (list_has_changed)
     g_signal_emit_by_name (backend, "printer-list-changed");