Merge lp:~mhr3/libzeitgeist/fix-reconnect into lp:libzeitgeist

[Michal Hruby]

A little bit of clarification - at first I went without the private is_connected member and I was calling g_object_notify (..., "connected") in the ..._appearead and ..._vanished callbacks, but it turned out that the g-name-owner property isn't yet updated when that callback is being processed, therefore zg might have been killed, and you would get a notification, but calling is_connected () would return TRUE.

Therefore I just added the private member and am updating everything in the name_owner_changed callback.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good

review: Approve

=== modified file 'src/zeitgeist-log.c'
--- src/zeitgeist-log.c	2011-07-11 17:55:46 +0000
+++ src/zeitgeist-log.c	2011-10-13 15:10:28 +0000
@@ -66,6 +66,9 @@
   /* Method calls queued up while waiting for a proxy  */
   GSList *method_dispatch_queue;
 
+  /* Are we connected to Zeitgeist? */
+  gboolean is_connected;
+
 } ZeitgeistLogPrivate;
 
 /* Property ids */
@@ -93,9 +96,9 @@
                                                  const gchar     *name_owner,
                                                  gpointer         user_data);
 
-static void    _zeitgeist_log_on_zg_vanished    (GDBusConnection *connection,
-                                                 const gchar *name,
-                                                 gpointer user_data);
+static void    _zeitgeist_log_on_name_owner_changed (GObject *proxy,
+                                                     GParamSpec *pspec,
+                                                     gpointer user_data);
 
 static void    _zeitgeist_log_on_zg_proxy_acquired (GObject *source_object,
                                                     GAsyncResult *res,
@@ -123,16 +126,17 @@
   ZeitgeistLogPrivate *priv;
 
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
-  
+  priv->log = NULL;
+
   /* Reset hash set of monitors */
   priv->monitors = g_hash_table_new (g_direct_hash, g_direct_equal);
-  
+
   /* Set up the connection to the ZG daemon */
   priv->watcher_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                        "org.gnome.zeitgeist.Engine",
                                        G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
                                        _zeitgeist_log_on_zg_appeared,
-                                       _zeitgeist_log_on_zg_vanished,
+                                       NULL,
                                        self,
                                        NULL);
 }
@@ -182,11 +186,12 @@
                             GParamSpec *pspec)
 {
   ZeitgeistLogPrivate *priv = ZEITGEIST_LOG_GET_PRIVATE (object);
+  gchar *name_owner;
 
   switch (prop_id)
     {
       case PROP_CONNECTED:
-        g_value_set_boolean (value, priv->log != NULL);
+        g_value_set_boolean (value, priv->is_connected);
         break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -984,15 +989,18 @@
       priv->connection = g_object_ref (connection);
     }
 
-  g_dbus_proxy_new (connection,
-                    G_DBUS_PROXY_FLAGS_NONE,
-                    NULL,
-                    name_owner,
-                    "/org/gnome/zeitgeist/log/activity",
-                    "org.gnome.zeitgeist.Log",
-                    NULL,
-                    _zeitgeist_log_on_zg_proxy_acquired,
-                    g_object_ref (self));
+  if (priv->log == NULL)
+    {
+      g_dbus_proxy_new (connection,
+                        G_DBUS_PROXY_FLAGS_NONE,
+                        NULL,
+                        name,
+                        "/org/gnome/zeitgeist/log/activity",
+                        "org.gnome.zeitgeist.Log",
+                        NULL,
+                        _zeitgeist_log_on_zg_proxy_acquired,
+                        g_object_ref (self));
+    }
 }
 
 /* Async callback for when a proxy is ready
@@ -1030,6 +1038,9 @@
       goto cleanup;
     }
 
+  g_signal_connect (priv->log, "notify::g-name-owner",
+      G_CALLBACK (_zeitgeist_log_on_name_owner_changed), self);
+
   /* Reinstate all active monitors */
   g_hash_table_iter_init (&iter, priv->monitors);
   while (g_hash_table_iter_next (&iter, &monitor, &dummy))
@@ -1037,6 +1048,7 @@
       _zeitgeist_log_install_monitor (self, ZEITGEIST_MONITOR (monitor));
     }
 
+  priv->is_connected = TRUE;
   g_object_notify (G_OBJECT (self), "connected");
 
   /* Dispatch all queued method calls we got while we didn't have a proxy.
@@ -1052,20 +1064,40 @@
 
 /* Called when the Zeitgeist daemon leaves the bus */
 static void
-_zeitgeist_log_on_zg_vanished (GDBusConnection *connection,
-                               const gchar *name,
-                               gpointer user_data)
+_zeitgeist_log_on_name_owner_changed (GObject *proxy,
+                                      GParamSpec *pspec,
+                                      gpointer user_data)
 {
   ZeitgeistLog        *self;
   ZeitgeistLogPrivate *priv;
+  gchar               *name_owner;
+  gboolean             connected;
+  GHashTableIter       iter;
+  gpointer             monitor, dummy;
 
   self = ZEITGEIST_LOG (user_data);
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
 
-  g_object_unref (priv->log);
-  priv->log = NULL;
-
-  g_object_notify (G_OBJECT (self), "connected");
+  name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (proxy));
+  connected = name_owner != NULL;
+
+  if (connected)
+    {
+      /* Reinstate all active monitors */
+      g_hash_table_iter_init (&iter, priv->monitors);
+      while (g_hash_table_iter_next (&iter, &monitor, &dummy))
+        {
+          _zeitgeist_log_install_monitor (self, ZEITGEIST_MONITOR (monitor));
+        }
+    }
+
+  if (priv->is_connected ^ connected) /* XOR here! */
+    {
+      priv->is_connected = connected;
+      g_object_notify (G_OBJECT (self), "connected");
+    }
+
+  if (name_owner) g_free (name_owner);
 }
 
 gboolean
@@ -1074,7 +1106,7 @@
   ZeitgeistLogPrivate *priv;
 
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
-  return priv->log != NULL;
+  return priv->is_connected;
 }
 
 /*