aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-08 14:29:02 -0600
committerTed Gould <ted@gould.cx>2010-02-08 14:29:02 -0600
commit8e2c91422b0113c1e09151587d8658c9e47ee0ae (patch)
tree6659aa107696c4e74039ccd862987aa57dcb3dc0
parentb7c84897cf0404bb42a6924ec69bdd15d2e4ed19 (diff)
parente530a69bb59e1c416ab5f1c07c3b09b58977be6d (diff)
downloadlibdbusmenu-8e2c91422b0113c1e09151587d8658c9e47ee0ae.tar.gz
libdbusmenu-8e2c91422b0113c1e09151587d8658c9e47ee0ae.tar.bz2
libdbusmenu-8e2c91422b0113c1e09151587d8658c9e47ee0ae.zip
* Upstream Merge
* Debugging message
-rw-r--r--debian/changelog7
-rw-r--r--libdbusmenu-glib/client.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d2c076e..d571f67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat3) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Debugging message
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 08 Feb 2010 14:28:48 -0600
+
libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat2) lucid; urgency=low
* Upstream Merge
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 1c1574c..69520bc 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -432,7 +432,7 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata)
if (priv->root != NULL) {
g_object_unref(G_OBJECT(priv->root));
priv->root = NULL;
- #ifdef MASSIVEDEBUGGING
+ #if 1
g_debug("Proxies destroyed, signaling a root change and a layout update.");
#endif
g_signal_emit(G_OBJECT(userdata), signals[ROOT_CHANGED], 0, NULL, TRUE);