diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-gtk/parser.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 5d8b8d9..1ef1780 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.93-0ubuntu2~ted2) UNRELEASED; urgency=low + + * Upstream Merge + * Fixing shutdown messages on destruction + + -- Ted Gould <ted@ubuntu.com> Mon, 24 Jan 2011 14:56:22 -0600 + libdbusmenu (0.3.93-0ubuntu2~ted1) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index cfce42a..52bd8a8 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -88,7 +88,9 @@ dbusmenu_gtk_parse_menu_structure (GtkWidget * widget) static void dbusmenu_cache_freed (gpointer data, GObject * obj) { - g_object_set_data(G_OBJECT(data), CACHED_MENUITEM, NULL); + /* If the dbusmenu item is killed we don't need to remove + the weak ref as well. */ + g_object_steal_data(G_OBJECT(data), CACHED_MENUITEM); return; } |