Speed up printer listing in the print dialog

Use shorter timeout for connection testing to avoid A 3-6 second
delay before the printers appear. Bug 594643

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 5f9ccb5e96e374aff6739ead160379675ae99831..7fd39847f18cd17f293d9e41206e1a0c70725113 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -112,6 +112,7 @@ struct _GtkPrintBackendCups
   
   guint list_printers_poll;
   guint list_printers_pending : 1;
+  gint  list_printers_attempts;
   guint got_default_printer   : 1;
   guint default_printer_poll;
   GtkCupsConnectionTest *cups_connection_test;
@@ -586,6 +587,7 @@ gtk_print_backend_cups_init (GtkPrintBackendCups *backend_cups)
   backend_cups->list_printers_poll = FALSE;  
   backend_cups->got_default_printer = FALSE;  
   backend_cups->list_printers_pending = FALSE;
+  backend_cups->list_printers_attempts = 0;
 
   backend_cups->requests = NULL;
   backend_cups->auth = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, overwrite_and_free);
@@ -641,6 +643,7 @@ gtk_print_backend_cups_dispose (GObject *object)
   if (backend_cups->list_printers_poll > 0)
     g_source_remove (backend_cups->list_printers_poll);
   backend_cups->list_printers_poll = 0;
+  backend_cups->list_printers_attempts = 0;
   
   if (backend_cups->default_printer_poll > 0)
     g_source_remove (backend_cups->default_printer_poll);
@@ -1578,6 +1581,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
           if (cups_backend->list_printers_poll > 0)
             g_source_remove (cups_backend->list_printers_poll);
           cups_backend->list_printers_poll = 0;
+          cups_backend->list_printers_attempts = 0;
         }
 
       goto done;
@@ -2110,8 +2114,23 @@ cups_request_printer_list (GtkPrintBackendCups *cups_backend)
   state = gtk_cups_connection_test_get_state (cups_backend->cups_connection_test);
   update_backend_status (cups_backend, state);
 
+  if (cups_backend->list_printers_attempts == 60)
+    {
+      cups_backend->list_printers_attempts = -1;
+      if (cups_backend->list_printers_poll > 0)
+        g_source_remove (cups_backend->list_printers_poll);
+      cups_backend->list_printers_poll = gdk_threads_add_timeout (200,
+                                           (GSourceFunc) cups_request_printer_list,
+                                           cups_backend);
+    }
+  else if (cups_backend->list_printers_attempts != -1)
+    cups_backend->list_printers_attempts++;
+
   if (state == GTK_CUPS_CONNECTION_IN_PROGRESS || state == GTK_CUPS_CONNECTION_NOT_AVAILABLE)
     return TRUE;
+  else
+    if (cups_backend->list_printers_attempts > 0)
+      cups_backend->list_printers_attempts = 60;
 
   cups_backend->list_printers_pending = TRUE;
 
@@ -2149,9 +2168,9 @@ cups_get_printer_list (GtkPrintBackend *backend)
   if (cups_backend->list_printers_poll == 0)
     {
       if (cups_request_printer_list (cups_backend))
-        cups_backend->list_printers_poll = gdk_threads_add_timeout_seconds (3,
-                                                        (GSourceFunc) cups_request_printer_list,
-                                                        backend);
+        cups_backend->list_printers_poll = gdk_threads_add_timeout (50,
+                                             (GSourceFunc) cups_request_printer_list,
+                                             backend);
     }
 }
 
@@ -2247,11 +2266,26 @@ cups_request_ppd (GtkPrinter *printer)
       state = gtk_cups_connection_test_get_state (cups_printer->remote_cups_connection_test);
 
       if (state == GTK_CUPS_CONNECTION_IN_PROGRESS)
-        return TRUE;
+        {
+          if (cups_printer->get_remote_ppd_attempts == 60)
+            {
+              cups_printer->get_remote_ppd_attempts = -1;
+              if (cups_printer->get_remote_ppd_poll > 0)
+                g_source_remove (cups_printer->get_remote_ppd_poll);
+              cups_printer->get_remote_ppd_poll = gdk_threads_add_timeout (200,
+                                                    (GSourceFunc) cups_request_ppd,
+                                                    printer);
+            }
+          else if (cups_printer->get_remote_ppd_attempts != -1)
+            cups_printer->get_remote_ppd_attempts++;
+
+          return TRUE;
+        }
 
       gtk_cups_connection_test_free (cups_printer->remote_cups_connection_test);
       cups_printer->remote_cups_connection_test = NULL;
       cups_printer->get_remote_ppd_poll = 0;
+      cups_printer->get_remote_ppd_attempts = 0;
 
       if (state == GTK_CUPS_CONNECTION_NOT_AVAILABLE)
         {
@@ -2501,9 +2535,9 @@ cups_get_default_printer (GtkPrintBackendCups *backend)
   if (cups_backend->default_printer_poll == 0)
     {
       if (cups_request_default_printer (cups_backend))
-        cups_backend->default_printer_poll = gdk_threads_add_timeout (500,
-                                                                      (GSourceFunc) cups_request_default_printer,
-                                                                      backend);
+        cups_backend->default_printer_poll = gdk_threads_add_timeout (200,
+                                               (GSourceFunc) cups_request_default_printer,
+                                               backend);
     }
 }
 
@@ -2634,7 +2668,7 @@ cups_printer_request_details (GtkPrinter *printer)
               cups_printer->remote_cups_connection_test = gtk_cups_connection_test_new (cups_printer->hostname);
 
               if (cups_request_ppd (printer))
-                cups_printer->get_remote_ppd_poll = gdk_threads_add_timeout (200,
+                cups_printer->get_remote_ppd_poll = gdk_threads_add_timeout (50,
                                                     (GSourceFunc) cups_request_ppd,
                                                     printer);
             }

diff --git a/modules/printbackends/cups/gtkprintercups.c b/modules/printbackends/cups/gtkprintercups.c
index a3c79af2553987d6b7821fe16f1f11d981268db9..ddf4d1d8a5d345a78cfe6e3cd582b057c89cf2c3 100644 (file)
--- a/modules/printbackends/cups/gtkprintercups.c
+++ b/modules/printbackends/cups/gtkprintercups.c
@@ -79,6 +79,7 @@ gtk_printer_cups_init (GtkPrinterCups *printer)
   printer->default_cover_after = NULL;
   printer->remote = FALSE;
   printer->get_remote_ppd_poll = 0;
+  printer->get_remote_ppd_attempts = 0;
   printer->remote_cups_connection_test = NULL;
   printer->auth_info_required = NULL;
 }
@@ -105,6 +106,7 @@ gtk_printer_cups_finalize (GObject *object)
 
   if (printer->get_remote_ppd_poll > 0)
     g_source_remove (printer->get_remote_ppd_poll);
+  printer->get_remote_ppd_attempts = 0;
 
   gtk_cups_connection_test_free (printer->remote_cups_connection_test);
 

diff --git a/modules/printbackends/cups/gtkprintercups.h b/modules/printbackends/cups/gtkprintercups.h
index 00d167ea428149960c8d38ee68c5d776a3b27fa7..6868232f29745478dbf0ffa544b915176f699bec 100644 (file)
--- a/modules/printbackends/cups/gtkprintercups.h
+++ b/modules/printbackends/cups/gtkprintercups.h
@@ -60,6 +60,7 @@ struct _GtkPrinterCups
 
   gboolean remote;
   guint get_remote_ppd_poll;
+  gint  get_remote_ppd_attempts;
   GtkCupsConnectionTest *remote_cups_connection_test;
 };