diff options
Diffstat (limited to 'libdbusmenu-gtk')
| -rw-r--r-- | libdbusmenu-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index e73c8c1..80e6058 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -19,7 +19,7 @@ libdbusmenu_gtk_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_gtk_la_CFLAGS = \ - $(DBUSMENUGTK_CFLAGS) + $(DBUSMENUGTK_CFLAGS) -Wall -Werror libdbusmenu_gtk_la_LIBADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 9bb23a8..26543be 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -179,14 +179,13 @@ menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, GtkMenu static void destoryed_dbusmenuitem_cb (gpointer udata, GObject * dbusmenuitem) { - g_object_destory(G_OBJECT(udata)); + g_object_unref(G_OBJECT(udata)); return; } static void connect_menuitem (DbusmenuMenuitem * mi, GtkMenuItem * gmi) { - g_object_ref(gmi); g_object_set_data_full(G_OBJECT(mi), data_menuitem, gmi, g_object_unref); g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), gmi); @@ -223,7 +222,7 @@ process_dbusmenu_menuitem (DbusmenuMenuitem * mi, GtkMenu * parentmenu) g_object_ref(gtkmenu); g_object_set_data_full(G_OBJECT(mi), data_menu, gtkmenu, g_object_unref); unknown_menu = gtkmenu; - gtk_menuitem_set_submenu(GTK_MENU_ITEM(unknown_menuitem), gtkmenu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(unknown_menuitem), gtkmenu); gtk_widget_show(gtkmenu); } |