[gnome-settings-daemon/rhel/account-and-subman-plugins: 11/23] subman: Increase RHSM dbus call timeouts

[Ray Strode <halfline src gnome org>]

commit 3f7dd5ac266ef913a3a399c966db7cd6e007c7b6
Author: Kalev Lember <klember redhat com>
Date:   Fri Jun 28 18:10:36 2019 +0200

    subman: Increase RHSM dbus call timeouts
    
    Increase the dbus timeouts to 5 minutes as the register/unregister calls
    seem to routinely take more than a minute.

 plugins/subman/gsd-subman-helper.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/plugins/subman/gsd-subman-helper.c b/plugins/subman/gsd-subman-helper.c
index 182f7190..af7a82e9 100644
--- a/plugins/subman/gsd-subman-helper.c
+++ b/plugins/subman/gsd-subman-helper.c
@@ -28,6 +28,8 @@
 #include <gio/gio.h>
 #include <json-glib/json-glib.h>
 
+#define DBUS_TIMEOUT 300000 /* 5 minutes */
+
 static void
 _helper_convert_error (const gchar *json_txt, GError **error)
 {
@@ -94,7 +96,8 @@ _helper_unregister (GError **error)
                                                     proxy_options,
                                                     ""), /* lang */
                                      G_DBUS_CALL_FLAGS_NONE,
-                                     -1, NULL, error);
+                                     DBUS_TIMEOUT,
+                                     NULL, error);
        return res != NULL;
 }
 
@@ -127,7 +130,8 @@ _helper_auto_attach (GError **error)
                                                     proxy_options,
                                                     ""), /* lang */
                                      G_DBUS_CALL_FLAGS_NONE,
-                                     -1, NULL, error);
+                                     DBUS_TIMEOUT,
+                                     NULL, error);
        if (res == NULL)
                return FALSE;
        g_variant_get (res, "(&s)", &str);
@@ -158,7 +162,8 @@ _helper_save_config (const gchar *key, const gchar *value, GError **error)
                                                     g_variant_new_string (value),
                                                     ""), /* lang */
                                      G_DBUS_CALL_FLAGS_NONE,
-                                     -1, NULL, error);
+                                     DBUS_TIMEOUT,
+                                     NULL, error);
        return res != NULL;
 }
 
@@ -305,7 +310,8 @@ main (int argc, char *argv[])
                                                             subman_conopts,
                                                             userlang),
                                              G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                             -1, NULL, &error_local);
+                                             DBUS_TIMEOUT,
+                                             NULL, &error_local);
                if (res == NULL) {
                        g_dbus_error_strip_remote_error (error_local);
                        _helper_convert_error (error_local->message, &error);
@@ -339,7 +345,8 @@ main (int argc, char *argv[])
                                                             subman_conopts,
                                                             userlang),
                                              G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                             -1, NULL, &error_local);
+                                             DBUS_TIMEOUT,
+                                             NULL, &error_local);
                if (res == NULL) {
                        g_dbus_error_strip_remote_error (error_local);
                        _helper_convert_error (error_local->message, &error);