diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-07-08 01:45:40 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-09-14 20:08:35 +0800 |
| commit | 41b43f2e962ed9c19c70e3d336398cdc9f900fc9 (patch) | |
| tree | 42c41e3ac1218ca07fb308716179414ee63a6407 /modules | |
| parent | 13c56b5b571501290215b62ccd056cd2412d9079 (diff) | |
| download | gsoc2013-evolution-41b43f2e962ed9c19c70e3d336398cdc9f900fc9.tar gsoc2013-evolution-41b43f2e962ed9c19c70e3d336398cdc9f900fc9.tar.gz gsoc2013-evolution-41b43f2e962ed9c19c70e3d336398cdc9f900fc9.tar.bz2 gsoc2013-evolution-41b43f2e962ed9c19c70e3d336398cdc9f900fc9.tar.lz gsoc2013-evolution-41b43f2e962ed9c19c70e3d336398cdc9f900fc9.tar.xz gsoc2013-evolution-41b43f2e962ed9c19c70e3d336398cdc9f900fc9.tar.zst gsoc2013-evolution-41b43f2e962ed9c19c70e3d336398cdc9f900fc9.zip | |
connman: Recover from dropped D-Bus connections faster.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/connman/evolution-connman.c | 15 |
1 files changed, 11 insertions, 4 deletions
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 |