diff options
author | Ted Gould <ted@gould.cx> | 2010-05-20 14:12:20 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-05-20 14:12:20 -0500 |
commit | 6a47d48b00ff36695a031c2452d2af03dc8c5cad (patch) | |
tree | ce3cf0afb9c90fa02b7cd926bc394b187a85e73d | |
parent | 629324674c65f9ddcc89ec50cac747ac7040d798 (diff) | |
parent | 80633aec06f8580bf2fda307565f41988705f08b (diff) | |
download | libayatana-appindicator-6a47d48b00ff36695a031c2452d2af03dc8c5cad.tar.gz libayatana-appindicator-6a47d48b00ff36695a031c2452d2af03dc8c5cad.tar.bz2 libayatana-appindicator-6a47d48b00ff36695a031c2452d2af03dc8c5cad.zip |
* Upstream Merge
* Unref the child that was created
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | docs/reference/html/ch01.html | 2 | ||||
-rw-r--r-- | src/libappindicator/app-indicator.c | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index b6a0673..9762c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.2.0~dev-0ubuntu1~ppa2) lucid; urgency=low + + * Upstream Merge + * Unref the child that was created + + -- Ted Gould <ted@ubuntu.com> Thu, 20 May 2010 14:11:57 -0500 + indicator-application (0.2.0~dev-0ubuntu1~ppa1) lucid; urgency=low * Upstream Merge diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html index e549aea..d1a4792 100644 --- a/docs/reference/html/ch01.html +++ b/docs/reference/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="Base Classes for Applications"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id525511"></a>Base Classes for Applications</h2></div></div></div> +<a name="id387749"></a>Base Classes for Applications</h2></div></div></div> <div class="toc"><dl><dt> <span class="refentrytitle"><a href="libappindicator-app-indicator.html">AppIndicator</a></span><span class="refpurpose"> — An object to put application information into the panel.</span> 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 |