diff options
| author | Ted Gould <ted@canonical.com> | 2009-08-04 16:34:08 +0100 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-08-04 16:34:08 +0100 |
| commit | f5c8526e3bb73345242ea37c337562182351020b (patch) | |
| tree | 432cb5de765f8484daa87646c0a60d3bac6b3f4f /libdbusmenu-glib/server.c | |
| parent | ec5c382624da19a1a83d1e75d21f74778df01f38 (diff) | |
| parent | 92f690257a45e81b86b39fc77ce1fe10c7b4908a (diff) | |
| download | libdbusmenu-f5c8526e3bb73345242ea37c337562182351020b.tar.gz libdbusmenu-f5c8526e3bb73345242ea37c337562182351020b.tar.bz2 libdbusmenu-f5c8526e3bb73345242ea37c337562182351020b.zip | |
Merging in the development branches
Diffstat (limited to 'libdbusmenu-glib/server.c')
| -rw-r--r-- | libdbusmenu-glib/server.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 562b2d7..ab5951f 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -86,7 +86,7 @@ static void dbusmenu_server_finalize (GObject *object); static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec); static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec); static void menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, gchar * value, DbusmenuServer * server); -static void menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, DbusmenuServer * server); +static void menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint pos, DbusmenuServer * server); static void menuitem_child_removed (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, DbusmenuServer * server); static void menuitem_signals_create (DbusmenuMenuitem * mi, gpointer data); static void menuitem_signals_remove (DbusmenuMenuitem * mi, gpointer data); @@ -306,7 +306,7 @@ menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, gchar * valu } static void -menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, DbusmenuServer * server) +menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint pos, DbusmenuServer * server) { menuitem_signals_create(child, server); /* TODO: We probably need to group the layout update signals to make the number more reasonble. */ @@ -490,6 +490,7 @@ dbusmenu_server_set_root (DbusmenuServer * self, DbusmenuMenuitem * root) g_value_init(&rootvalue, G_TYPE_OBJECT); g_value_set_object(&rootvalue, root); g_object_set_property(G_OBJECT(self), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootvalue); + g_object_unref(G_OBJECT(root)); return; } |