[telepathy-mission-control/master] Band-aid patch for fd.o bug 23921. This bug is actually in dbus-daemon and should be fixed there.

[George Goldberg]

This patch forces the dbus-daemon to reload its configuration before MC asks it to list
activatable names on startup. This makes it detect .service files that have been
installed since starting the dbus daemon.

It does NOT allow adding more activatable clients once MC has been started up.

Upstream DBus bug is fd.o bug 23925.

Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
---
 src/mcd-dispatcher.c |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 477b6b9..c16bb06 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2806,6 +2806,28 @@ list_activatable_names_cb (TpDBusDaemon *proxy,
 }
 
 static void
+reload_config_cb (TpDBusDaemon *proxy,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+    McdDispatcher *self = MCD_DISPATCHER (weak_object);
+
+    if (error != NULL)
+    {
+        DEBUG ("ReloadConfig returned error. Recent .service files may not be found: %s %d: %s",
+               g_quark_to_string (error->domain), error->code, error->message);
+    }
+
+    tp_cli_dbus_daemon_call_list_activatable_names (self->priv->dbus_daemon,
+        -1, list_activatable_names_cb, NULL, NULL, weak_object);
+    /* deliberately not calling mcd_dispatcher_release_startup_lock here -
+     * this function is "lock-neutral", similarly to list_names_cb (we would
+     * take a lock for ListActivatableNames then release the one used for
+     * ReloadConfig), so simplify by doing nothing */
+}
+
+static void
 list_names_cb (TpDBusDaemon *proxy,
     const gchar **names,
     const GError *error,
@@ -2832,12 +2854,14 @@ list_names_cb (TpDBusDaemon *proxy,
         }
     }
 
-    tp_cli_dbus_daemon_call_list_activatable_names (self->priv->dbus_daemon,
-        -1, list_activatable_names_cb, NULL, NULL, weak_object);
+    /* Call reload config because the dbus daemon often fails to notice newly
+     * installed .service files on its own. */
+    tp_cli_dbus_daemon_call_reload_config (self->priv->dbus_daemon, -1,
+        reload_config_cb, NULL, NULL, weak_object);
     /* deliberately not calling mcd_dispatcher_release_startup_lock here -
-     * this function is "lock-neutral" (we would take a lock for
-     * ListActivatableNames then release the one used for ListNames),
-     * so simplify by doing nothing */
+     * this function is "lock-neutral" (we would take a lock for ReloadConfig
+     * then release the one used for ListNames), so simplify by doing
+     * nothing */
 }
 
 static void
-- 
1.5.6.5