Use a resonable timeout of 3 seconds when polling for printer list

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

        * modules/printbackend/cups/gtkprintbackendcups.c: Use a
        resonable timeout of 3 seconds when polling for printer
        list updates, instead of 300000 seconds...

diff --git a/ChangeLog b/ChangeLog
index 17114f390a010d7ba9db058e146ae1731bf1e853..2aaa9a423e1a684bd28324a9a1ab136e9e5e71d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-28  Matthias Clasen   <mclasen@redhat.com>
+
+       * modules/printbackend/cups/gtkprintbackendcups.c: Use a
+       resonable timeout of 3 seconds when polling for printer
+       list updates, instead of 300000 seconds...
+
 2006-08-28  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtktextbufferserialize.c (serialize_text): don't write out

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index ac9193854eb99c1ec8c45cba5c39c304989fcda7..3f5255ee537e69b74bdd1b3910191a41f671d716 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -448,7 +448,8 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
 static void
 gtk_print_backend_cups_init (GtkPrintBackendCups *backend_cups)
 {
-  backend_cups->list_printers_poll = 0;  
+  backend_cups->list_printers_poll = FALSE;  
+  backend_cups->got_default_printer = FALSE;  
   backend_cups->list_printers_pending = FALSE;
 
   cups_request_default_printer (backend_cups);
@@ -1185,7 +1186,7 @@ cups_get_printer_list (GtkPrintBackend *backend)
   if (cups_backend->list_printers_poll == 0)
     {
       cups_request_printer_list (cups_backend);
-      cups_backend->list_printers_poll = g_timeout_add (3000 * 100000,
+      cups_backend->list_printers_poll = g_timeout_add (3000,
                                                         (GSourceFunc) cups_request_printer_list,
                                                         backend);
     }