libnm-glib: use max timeout for settings dbus calls
authorDan Williams <dcbw@redhat.com>
Mon, 26 Apr 2010 05:48:10 +0000 (22:48 -0700)
committerDan Williams <dcbw@redhat.com>
Mon, 26 Apr 2010 05:48:10 +0000 (22:48 -0700)
These calls may require authentication, and thus could be in-progress
for much longer than the default D-Bus timeout, which is pretty short.

libnm-glib/nm-remote-connection.c
libnm-glib/nm-remote-settings-system.c
libnm-glib/nm-remote-settings.c

index 6495647..5d104d0 100644 (file)
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2007 - 2008 Novell, Inc.
- * Copyright (C) 2007 - 2009 Red Hat, Inc.
+ * Copyright (C) 2007 - 2010 Red Hat, Inc.
  */
 
 #include <string.h>
@@ -324,12 +324,14 @@ constructor (GType type,
                                                 nm_connection_get_path (NM_CONNECTION (object)),
                                                 NM_DBUS_IFACE_SETTINGS_CONNECTION);
        g_assert (priv->proxy);
+       dbus_g_proxy_set_default_timeout (priv->proxy, G_MAXINT);
 
        priv->secrets_proxy = dbus_g_proxy_new_for_name (priv->bus,
                                                         service,
                                                         nm_connection_get_path (NM_CONNECTION (object)),
                                                         NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS);
        g_assert (priv->secrets_proxy);
+       dbus_g_proxy_set_default_timeout (priv->secrets_proxy, G_MAXINT);
 
        dbus_g_proxy_add_signal (priv->proxy, "Updated", DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, G_TYPE_INVALID);
        dbus_g_proxy_connect_signal (priv->proxy, "Updated", G_CALLBACK (updated_cb), object, NULL);
index 4e30fda..95098c7 100644 (file)
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009 - 2010 Red Hat, Inc.
  */
 
 #include <string.h>
@@ -280,6 +280,7 @@ constructor (GType type,
                                                 NM_DBUS_PATH_SETTINGS,
                                                 NM_DBUS_IFACE_SETTINGS_SYSTEM);
        g_assert (priv->proxy);
+       dbus_g_proxy_set_default_timeout (priv->proxy, G_MAXINT);
 
        dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__BOXED,
                                           G_TYPE_NONE,
index 55ae0f3..92814a1 100644 (file)
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009 - 2010 Red Hat, Inc.
  */
 
 #include <string.h>
@@ -414,6 +414,7 @@ constructor (GType type,
                                                 NM_DBUS_PATH_SETTINGS,
                                                 NM_DBUS_IFACE_SETTINGS);
        g_assert (priv->proxy);
+       dbus_g_proxy_set_default_timeout (priv->proxy, G_MAXINT);
 
        dbus_g_proxy_add_signal (priv->proxy, "NewConnection",
                                 DBUS_TYPE_G_OBJECT_PATH,