aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-01-24 14:56:42 -0600
committerTed Gould <ted@gould.cx>2011-01-24 14:56:42 -0600
commit14f9bef014c08947c3e227b0831ebfd6c9bc7930 (patch)
treec77345bc8641510c587b554104e8c04fdb4a8dc9 /libdbusmenu-gtk
parent8320e25b7893fd9ad286defa6f94d6e4995e5aae (diff)
parent25ab785826d59d8ca7860b0d0bc39d6187a3a1ed (diff)
downloadlibdbusmenu-14f9bef014c08947c3e227b0831ebfd6c9bc7930.tar.gz
libdbusmenu-14f9bef014c08947c3e227b0831ebfd6c9bc7930.tar.bz2
libdbusmenu-14f9bef014c08947c3e227b0831ebfd6c9bc7930.zip
* Upstream Merge
* Fixing shutdown messages on destruction
Diffstat (limited to 'libdbusmenu-gtk')
-rw-r--r--libdbusmenu-gtk/parser.c4
1 files changed, 3 insertions, 1 deletions
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;
}