From 030d6a4f5a48fcac6333cc4159fc343141339a15 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 12:21:59 -0600 Subject: We need to reduce the ref count on the old root even if there wasn't a change. --- libdbusmenu-glib/client.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 2302110..1c1574c 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -778,14 +778,14 @@ parse_layout (DbusmenuClient * client, const gchar * layout) g_object_ref(priv->root); dbusmenu_menuitem_set_root(priv->root, TRUE); - if (oldroot != NULL) { - dbusmenu_menuitem_set_root(oldroot, FALSE); - g_object_unref(oldroot); - } - g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } + if (oldroot != NULL) { + dbusmenu_menuitem_set_root(oldroot, FALSE); + g_object_unref(oldroot); + } + return 1; } -- cgit v1.2.3 From ba5b0697ef6bc15161b2d05beb8cd664c9e543ea Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 12:28:23 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2126d83..f3edffe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat1) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat1) lucid; urgency=low * Upstream Merge * Making sure to unref the old item in all cases. - -- Ted Gould Mon, 08 Feb 2010 12:25:56 -0600 + -- Ted Gould Mon, 08 Feb 2010 12:28:21 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From a9b3012fc237da6dc0575b6695e5247529c971cb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 13:49:57 -0600 Subject: Debugging messages --- libdbusmenu-glib/menuitem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index a2d2682..54cb6dc 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -270,6 +270,7 @@ _g_value_free (gpointer data) static void dbusmenu_menuitem_init (DbusmenuMenuitem *self) { + g_debug("Menuitem init: %X", (guint)self); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(self); priv->id = -1; @@ -285,6 +286,7 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self) static void dbusmenu_menuitem_dispose (GObject *object) { + g_debug("Menuitem dele: %X", (guint)self); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(object); GList * child = NULL; -- cgit v1.2.3 From 46b5f010ff1ea0fcdbab0b1cdc0c224dc67dba5b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 13:50:21 -0600 Subject: With typos --- libdbusmenu-glib/menuitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 54cb6dc..ba8b136 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -286,7 +286,7 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self) static void dbusmenu_menuitem_dispose (GObject *object) { - g_debug("Menuitem dele: %X", (guint)self); + g_debug("Menuitem dele: %X", (guint)object); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(object); GList * child = NULL; -- cgit v1.2.3 From b7c84897cf0404bb42a6924ec69bdd15d2e4ed19 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 13:53:42 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2b6309..d2c076e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat2) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat2) lucid; urgency=low * Upstream Merge * Debugging message - -- Ted Gould Mon, 08 Feb 2010 13:50:32 -0600 + -- Ted Gould Mon, 08 Feb 2010 13:53:40 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat1) lucid; urgency=low -- cgit v1.2.3 From e530a69bb59e1c416ab5f1c07c3b09b58977be6d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 14:28:33 -0600 Subject: Printing out proxy destroy --- libdbusmenu-glib/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3 From 95da331be05c5da867a885719aa844d1e9e34ccc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 14:43:06 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d571f67..db8c8cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat3) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat3) lucid; urgency=low * Upstream Merge * Debugging message - -- Ted Gould Mon, 08 Feb 2010 14:28:48 -0600 + -- Ted Gould Mon, 08 Feb 2010 14:43:04 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat2) lucid; urgency=low -- cgit v1.2.3 From 815fb184f7ec28d0a3a23f7dd63d2246e8d2f2ea Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 15:32:26 -0600 Subject: Printing more debugging. --- libdbusmenu-glib/client.c | 1 + libdbusmenu-glib/menuitem.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 69520bc..20f3620 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -430,6 +430,7 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata) DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(userdata); if (priv->root != NULL) { + g_debug("Root ref count: %d", ((GObject *)priv->root)->ref_count); g_object_unref(G_OBJECT(priv->root)); priv->root = NULL; #if 1 diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index ba8b136..f494487 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -291,6 +291,7 @@ dbusmenu_menuitem_dispose (GObject *object) GList * child = NULL; for (child = priv->children; child != NULL; child = g_list_next(child)) { + g_debug("Unreffing %X", (guint)child->data); g_object_unref(G_OBJECT(child->data)); } g_list_free(priv->children); -- cgit v1.2.3 From fdb8fd92150e09cf3d30c4d41e5610ee1e9bd8d7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 15:36:51 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d614bb9..376220a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat4) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat4) lucid; urgency=low * Upstream Merge * Debugging message - -- Ted Gould Mon, 08 Feb 2010 15:32:46 -0600 + -- Ted Gould Mon, 08 Feb 2010 15:36:49 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat3) lucid; urgency=low -- cgit v1.2.3 From 12f9f09aab33976f0bfe0ee358f3335df6c0ff9c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 15:48:22 -0600 Subject: Debugging. --- libdbusmenu-glib/client.c | 1 + libdbusmenu-glib/menuitem.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 20f3620..7bc3eb5 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -432,6 +432,7 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata) if (priv->root != NULL) { g_debug("Root ref count: %d", ((GObject *)priv->root)->ref_count); g_object_unref(G_OBJECT(priv->root)); + g_debug(" ref count: %d", ((GObject *)priv->root)->ref_count); priv->root = NULL; #if 1 g_debug("Proxies destroyed, signaling a root change and a layout update."); diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index f494487..f5bd18d 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -304,7 +304,7 @@ dbusmenu_menuitem_dispose (GObject *object) static void dbusmenu_menuitem_finalize (GObject *object) { - /* g_debug("Menuitem dying"); */ + g_debug("Menuitem dying"); DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(object); if (priv->properties != NULL) { -- cgit v1.2.3 From 7cbb892373e78a26a7c50d535b97c444139b5942 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 15:50:02 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0cb68f..7f663eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat5) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat5) lucid; urgency=low * Upstream Merge * Debugging message - -- Ted Gould Mon, 08 Feb 2010 15:48:33 -0600 + -- Ted Gould Mon, 08 Feb 2010 15:49:58 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat4) lucid; urgency=low -- cgit v1.2.3 From 2b26528b9d2feefd8ab014e7743a12521837be5f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 15:53:24 -0600 Subject: Removing the setting of root and the ref. --- libdbusmenu-glib/client.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 7bc3eb5..64fc7d3 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -776,10 +776,6 @@ parse_layout (DbusmenuClient * client, const gchar * layout) g_debug("Client signaling root changed."); #endif - /* Switch the root around */ - g_object_ref(priv->root); - dbusmenu_menuitem_set_root(priv->root, TRUE); - g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE); } -- cgit v1.2.3 From 8f6dbb970e761517fb32760e81a4759c2aeb307c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 15:55:55 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f456d97..d780f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat6) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat6) lucid; urgency=low * Upstream Merge * Removing the ref to root and a setting of root - -- Ted Gould Mon, 08 Feb 2010 15:53:42 -0600 + -- Ted Gould Mon, 08 Feb 2010 15:55:53 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat5) lucid; urgency=low -- cgit v1.2.3 From b50e7c722403caae5e40157b1b70a7a6ac8a206f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 16:04:15 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2~repeat7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88ad187..2e8ff63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat7) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat7) lucid; urgency=low * Upstream Merge * Removing debug messages - -- Ted Gould Mon, 08 Feb 2010 16:02:40 -0600 + -- Ted Gould Mon, 08 Feb 2010 16:04:12 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa2~repeat6) lucid; urgency=low -- cgit v1.2.3 From ba028f8b4889fe56863065cbcbb8284c36517913 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Feb 2010 08:53:03 -0600 Subject: releasing version 0.2.3-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cb93c12..062ab19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.2.3-0ubuntu1~ppa2) UNRELEASED; urgency=low +libdbusmenu (0.2.3-0ubuntu1~ppa2) lucid; urgency=low * Upstream Merge * Removing the ref to root and a setting of root - -- Ted Gould Tue, 09 Feb 2010 08:49:16 -0600 + -- Ted Gould Tue, 09 Feb 2010 08:53:00 -0600 libdbusmenu (0.2.3-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3