From 41b43f2e962ed9c19c70e3d336398cdc9f900fc9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 7 Jul 2011 13:45:40 -0400 Subject: connman: Recover from dropped D-Bus connections faster. --- modules/connman/evolution-connman.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c index 0a320a1f6c..f6225df46c 100644 --- a/modules/connman/evolution-connman.c +++ b/modules/connman/evolution-connman.c @@ -67,17 +67,24 @@ extension_set_state (EConnMan *extension, } static void -connman_connection_closed_cb (GDBusConnection *pconnection, +connman_connection_closed_cb (GDBusConnection *connection, gboolean remote_peer_vanished, GError *error, - gpointer user_data) + EConnMan *extension) { - EConnMan *extension = user_data; + gboolean try_again; g_object_unref (extension->connection); extension->connection = NULL; - g_timeout_add_seconds (3, (GSourceFunc) connman_connect, extension); + /* Try connecting to the session bus immediately, and then + * keep trying at 3 second intervals until we're back on. */ + + try_again = connman_connect (extension); + + if (try_again) + g_timeout_add_seconds ( + 3, (GSourceFunc) connman_connect, extension); } static void -- cgit v1.2.3