aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-05-19 14:22:27 -0500
committerTed Gould <ted@gould.cx>2010-05-19 14:22:27 -0500
commit86207021c8e405ff2a82c5dad8cc143fcba4d39c (patch)
treec5c0d38c8c8cb5ae886d3a66050cff3da5ccaf79
parent629324674c65f9ddcc89ec50cac747ac7040d798 (diff)
parent8566afcd564d10cc11be09bba56e02b78df101e7 (diff)
downloadayatana-indicator-application-86207021c8e405ff2a82c5dad8cc143fcba4d39c.tar.gz
ayatana-indicator-application-86207021c8e405ff2a82c5dad8cc143fcba4d39c.tar.bz2
ayatana-indicator-application-86207021c8e405ff2a82c5dad8cc143fcba4d39c.zip
* Upstream Merge
* Unref the child that was created
-rw-r--r--debian/changelog7
-rw-r--r--src/libappindicator/app-indicator.c6
2 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b6a0673..b7a8fb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.2.0~dev-0ubuntu1~ppa2~childleak1) lucid; urgency=low
+
+ * Upstream Merge
+ * Unref the child that was created
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 19 May 2010 14:22:05 -0500
+
indicator-application (0.2.0~dev-0ubuntu1~ppa1) lucid; urgency=low
* Upstream Merge
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 132e279..f7e121b 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -1408,6 +1408,12 @@ container_iterate (GtkWidget *widget,
DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
G_CALLBACK (activate_menuitem), widget);
dbusmenu_menuitem_child_append (root, child);
+
+ /* Get rid of initial ref now that the root is
+ holding the object */
+ g_object_unref(child);
+
+ return;
}
static void