From 3758df51a8e1f7e5b7585a0a62ad07400d1f55fd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 19 Oct 2010 18:47:22 -0500 Subject: Adding a check for the name to ensure we didn't miss it --- src/app-indicator.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 6511589..44b1050 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 +#include + #include #include @@ -1052,6 +1054,17 @@ 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 (exists) { + 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 +1087,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; -- cgit v1.2.3 From ccea5af6d5cce8bcb3a6f14fa8a4325708e0e71c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 19 Oct 2010 18:48:39 -0500 Subject: Add a nice little warning in --- src/app-indicator.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 44b1050..5a9e531 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1058,6 +1058,11 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c 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) { dbus_owner_change(proxy, NOTIFICATION_WATCHER_DBUS_ADDR, NULL, "Non NULL", userdata); } -- cgit v1.2.3 From 7fa4cd49b4187bc1f9b9659119135c0c43d5a8bf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 19 Oct 2010 20:29:14 -0400 Subject: releasing version 0.2.9-0ubuntu2~ppa2~race1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index af36774..d7a5d98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-application (0.2.9-0ubuntu2~ppa2~race1) UNRELEASED; urgency=low +indicator-application (0.2.9-0ubuntu2~ppa2~race1) maverick; urgency=low * Upstream Merge * A race fix on the dbus name - -- Ted Gould Tue, 19 Oct 2010 20:27:00 -0400 + -- Ted Gould Tue, 19 Oct 2010 20:29:12 -0400 indicator-application (0.2.9-0ubuntu2~ppa1) maverick; urgency=low -- cgit v1.2.3 From b176944e2d256abca0ced734f31e09d621a19998 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 20 Oct 2010 15:22:46 -0400 Subject: Uhg, we need a message to know if we've fixed the bug. --- src/app-indicator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 5a9e531..4f7daa8 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1064,6 +1064,7 @@ check_owner_cb (DBusGProxy *proxy, gboolean exists, GError *error, gpointer user } 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); } -- cgit v1.2.3 From 52c2b074b812d8748600e2532621375f9011806b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 20 Oct 2010 16:06:42 -0400 Subject: releasing version 0.2.9-0ubuntu2~ppa2~race2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1cdfb45..7d0520b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-application (0.2.9-0ubuntu2~ppa2~race2) UNRELEASED; urgency=low +indicator-application (0.2.9-0ubuntu2~ppa2~race2) maverick; urgency=low * Upstream Merge * Making a printout - -- Ted Gould Wed, 20 Oct 2010 15:23:08 -0400 + -- Ted Gould Wed, 20 Oct 2010 16:06:40 -0400 indicator-application (0.2.9-0ubuntu2~ppa2~race1) maverick; urgency=low -- cgit v1.2.3