diff options
author | Ted Gould <ted@gould.cx> | 2011-02-04 15:33:14 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-02-04 15:33:14 -0600 |
commit | f178717c995eafa5f2cfc9ec9cc64d1022b568d4 (patch) | |
tree | 95ddfbfabbfed6ae9f51b5484674f86a9e8e1ccd | |
parent | 6fe7de54ad02b5ba121c2a5e3cdf2b9453dd83f5 (diff) | |
parent | 6da530ab489871e8da45db87d7ba922fdb9e4a56 (diff) | |
download | ayatana-indicator-datetime-f178717c995eafa5f2cfc9ec9cc64d1022b568d4.tar.gz ayatana-indicator-datetime-f178717c995eafa5f2cfc9ec9cc64d1022b568d4.tar.bz2 ayatana-indicator-datetime-f178717c995eafa5f2cfc9ec9cc64d1022b568d4.zip |
* Upstream Merge
* Unreffing the menu item
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | src/datetime-service.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 30c5353..1e165c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt2) UNRELEASED; urgency=low + + * Upstream Merge + * Unreffing the menu item + + -- Ted Gould <ted@ubuntu.com> Fri, 04 Feb 2011 15:32:55 -0600 + indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt1) natty; urgency=low * Upstream Merge diff --git a/src/datetime-service.c b/src/datetime-service.c index 93e9264..6a925bb 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -327,6 +327,7 @@ update_appointment_menu_items (gpointer user_data) { appointments = g_list_remove(appointments, item); dbusmenu_menuitem_child_delete(root, DBUSMENU_MENUITEM(item)); //g_free(item); freeing makes it crash :/ is that a double free from child delete? + g_object_unref(G_OBJECT(item)); item = NULL; } appointments = NULL; |