diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-16 11:43:38 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-16 11:43:38 -0500 |
| commit | dd2a7ffb5cb5d991df48ae76ad49b7eb6ed37a5f (patch) | |
| tree | 281446f2f9a8d85fbb05fda6d45cf5f7fa27e967 | |
| parent | f7db6d7608892ce17919bcf975c24da65f65f62a (diff) | |
| parent | f8cf97fa209b64c4f466cda3c33bbec068a4539c (diff) | |
| download | libdbusmenu-dd2a7ffb5cb5d991df48ae76ad49b7eb6ed37a5f.tar.gz libdbusmenu-dd2a7ffb5cb5d991df48ae76ad49b7eb6ed37a5f.tar.bz2 libdbusmenu-dd2a7ffb5cb5d991df48ae76ad49b7eb6ed37a5f.zip | |
* Upstream merge
* Protecting references before signalling
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index c1e26a3..b01b3e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.9-0ubuntu2~ppa2~refs3) UNRELEASED; urgency=low + + * Upstream merge + * Protecting references before signalling + + -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 11:43:18 -0500 + libdbusmenu (0.2.9-0ubuntu2~ppa2~refs2) lucid; urgency=low * Upstream merge diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 220f7e5..6a3c4bc 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -491,8 +491,8 @@ take_children_signal (gpointer data, gpointer user_data) #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(user_data), LABEL(user_data), ID(data), LABEL(data)); #endif - g_object_unref(G_OBJECT(data)); g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE); + g_object_unref(G_OBJECT(data)); return; } @@ -681,8 +681,8 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) #ifdef MASSIVEDEBUGGING g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(mi), LABEL(mi), ID(child), LABEL(child)); #endif - g_object_unref(G_OBJECT(child)); g_signal_emit(G_OBJECT(mi), signals[CHILD_REMOVED], 0, child, TRUE); + g_object_unref(G_OBJECT(child)); return TRUE; } |