* Upstream Merge

  * A race fix on the dbus name (LP: #526499)

2 files changed, 31 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 77dfe86..4467c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.2.9-0ubuntu2~ppa2) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * A race fix on the dbus name (LP: #526499)
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 01 Nov 2010 11:09:26 -0500
+
 indicator-application (0.2.9-0ubuntu2~ppa1) maverick; urgency=low
 
   * Upstream Merge
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 6511589..4f7daa8 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -32,6 +32,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 #endif
 
 #include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-gtk/client.h>
 
@@ -1052,6 +1054,23 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c
 	return;
 }
 
+/* Checking to see if someone already has the name we're looking for */
+static void
+check_owner_cb (DBusGProxy *proxy, gboolean exists, GError *error, gpointer userdata)
+{
+	if (error != NULL) {
+		g_warning("Unable to check for '" NOTIFICATION_WATCHER_DBUS_ADDR "' on DBus.  No worries, but concerning.");
+		return;
+	}
+
+	if (exists) {
+		g_debug("Woah, we actually has a race condition with dbus");
+		dbus_owner_change(proxy, NOTIFICATION_WATCHER_DBUS_ADDR, NULL, "Non NULL", userdata);
+	}
+
+	return;
+}
+
 /* This is an idle function to create the proxy.  This is mostly
    because start_fallback_timer can get called in the distruction
    of a proxy and thus the proxy manager gets confused when creating
@@ -1074,6 +1093,11 @@ setup_name_owner_proxy (gpointer data)
 		                        G_TYPE_INVALID);
 		dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged",
 		                            G_CALLBACK(dbus_owner_change), data, NULL);
+
+		/* Check to see if anyone has the name we're looking for
+		   just incase we missed it changing. */
+
+		org_freedesktop_DBus_name_has_owner_async(priv->dbus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, check_owner_cb, data);
 	}
 
 	return FALSE;