aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-10-20 15:23:29 -0400
committerTed Gould <ted@gould.cx>2010-10-20 15:23:29 -0400
commit77d4ced2d4d4230de6f3d7bca6c316ba34c0fda5 (patch)
tree13b454418f2143425e0fd8e341732e3730fd5847
parent7fa4cd49b4187bc1f9b9659119135c0c43d5a8bf (diff)
parentb176944e2d256abca0ced734f31e09d621a19998 (diff)
downloadlibayatana-appindicator-77d4ced2d4d4230de6f3d7bca6c316ba34c0fda5.tar.gz
libayatana-appindicator-77d4ced2d4d4230de6f3d7bca6c316ba34c0fda5.tar.bz2
libayatana-appindicator-77d4ced2d4d4230de6f3d7bca6c316ba34c0fda5.zip
* Upstream Merge
* Making a printout
-rw-r--r--debian/changelog7
-rw-r--r--src/app-indicator.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d7a5d98..1cdfb45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.2.9-0ubuntu2~ppa2~race2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Making a printout
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 20 Oct 2010 15:23:08 -0400
+
indicator-application (0.2.9-0ubuntu2~ppa2~race1) maverick; urgency=low
* Upstream Merge
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);
}