[gdm] Session/SessionWorker: fix timeouts for DBus calls



commit c34004ed4a17b6d7072899e016bbaba3825025ab
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Thu Aug 16 19:40:29 2012 +0200

    Session/SessionWorker: fix timeouts for DBus calls
    
    The default timeout for async DBus calls is 25 seconds (hardcoded in
    GIO), which is not enough if user interaction is involved during
    the call (such as during an InfoQuery). Instead, remove the timeout
    entirely.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682009

 daemon/gdm-session-worker.c |    2 +-
 daemon/gdm-session.c        |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index b050606..3066cc1 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -2814,7 +2814,7 @@ gdm_session_worker_constructor (GType                  type,
                 exit (1);
         }
 
-        g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (worker->priv->manager), -1);
+        g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (worker->priv->manager), G_MAXINT);
 
         /* Send an initial Hello message so that the session can associate
          * the conversation we manage with our pid.
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index d7a72e0..d314fc9 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -1048,6 +1048,8 @@ register_worker (GdmDBusWorkerManager  *worker_manager_interface,
                                                                      NULL,
                                                                      GDM_WORKER_DBUS_PATH,
                                                                      NULL, NULL);
+        g_dbus_proxy_set_default_timeout (conversation->worker_proxy, G_MAXINT);
+
         g_signal_connect (conversation->worker_proxy,
                           "username-changed",
                           G_CALLBACK (worker_on_username_changed), conversation);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]