[gnome-control-center] printers: Set longer timeouts

[Marek KaÅÃk <mkasik src gnome org>]

commit 9428b7a641052f164a4d7f1b78958ecf931e01f5
Author: Marek Kasik <mkasik redhat com>
Date:   Mon Sep 3 21:18:58 2012 +0200

    printers: Set longer timeouts
    
    Set longer timeouts for GetBestDrivers, PrinterAddOption and
    PrinterAddOptionDefault. These can take more time than already
    specified timeouts. (#683229)

 panels/printers/pp-utils.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
index 55f0c03..e8638aa 100644
--- a/panels/printers/pp-utils.c
+++ b/panels/printers/pp-utils.c
@@ -29,7 +29,8 @@
 
 #include "pp-utils.h"
 
-#define DBUS_TIMEOUT 120000
+#define DBUS_TIMEOUT      120000
+#define DBUS_TIMEOUT_LONG 600000
 
 #if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
 #define HAVE_CUPS_1_6 1
@@ -3457,7 +3458,7 @@ get_device_attributes_cb (gchar    *device_id,
                                          device_uri),
                           G_VARIANT_TYPE ("(a(ss))"),
                           G_DBUS_CALL_FLAGS_NONE,
-                          DBUS_TIMEOUT,
+                          DBUS_TIMEOUT_LONG,
                           data->cancellable,
                           get_ppd_names_async_dbus_scb,
                           data);
@@ -3751,7 +3752,6 @@ get_device_attributes_async (const gchar  *printer_name,
   if (!printer_name)
    {
      callback (NULL, NULL, NULL, user_data);
-
      return;
    }
 
@@ -4605,7 +4605,7 @@ printer_add_option_async (const gchar   *printer_name,
                                          &array_builder),
                           G_VARIANT_TYPE ("(s)"),
                           G_DBUS_CALL_FLAGS_NONE,
-                          -1,
+                          DBUS_TIMEOUT,
                           cancellable,
                           printer_add_option_async_dbus_cb,
                           data);