diff options
| author | Ted Gould <ted@canonical.com> | 2009-06-26 12:53:15 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-06-26 12:53:15 -0500 |
| commit | eea69ca7f7a48ff17a02adee6a2640663b9c0245 (patch) | |
| tree | 38649b1c136a1146bb702c97e4cf0f57a478d0ac /libdbusmenu-gtk | |
| parent | fc6e61d8d731b4cfb7f8e3598893b4805807ffe4 (diff) | |
| download | libdbusmenu-eea69ca7f7a48ff17a02adee6a2640663b9c0245.tar.gz libdbusmenu-eea69ca7f7a48ff17a02adee6a2640663b9c0245.tar.bz2 libdbusmenu-eea69ca7f7a48ff17a02adee6a2640663b9c0245.zip | |
Removing the old is_root and now using the new property on the menuitems for that task.
Diffstat (limited to 'libdbusmenu-gtk')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 12 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index f715e35..a236123 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -154,16 +154,10 @@ new_menuitem (DbusmenuClient * client, DbusmenuMenuitem * mi, gpointer userdata) return; } -static gboolean -is_root (DbusmenuGtkClient * gtkclient, DbusmenuMenuitem * mi) -{ - return mi == dbusmenu_client_get_root(DBUSMENU_CLIENT(gtkclient)); -} - static void new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position, DbusmenuGtkClient * gtkclient) { - if (is_root(gtkclient, mi)) { return; } + if (dbusmenu_menuitem_get_root(mi)) { return; } gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); GtkMenu * menu = GTK_MENU(ann_menu); @@ -186,7 +180,7 @@ new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position, Dbus static void delete_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, DbusmenuGtkClient * gtkclient) { - if (is_root(gtkclient, mi)) { return; } + if (dbusmenu_menuitem_get_root(mi)) { return; } if (g_list_length(dbusmenu_menuitem_get_children(mi)) == 0) { gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); @@ -204,7 +198,7 @@ delete_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, DbusmenuGtkClient static void move_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint new, guint old, DbusmenuGtkClient * gtkclient) { - if (is_root(gtkclient, mi)) { return; } + if (dbusmenu_menuitem_get_root(mi)) { return; } gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); if (ann_menu == NULL) { diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index a59421a..b54df7b 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -215,7 +215,6 @@ root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGt static void root_changed (DbusmenuGtkClient * client, DbusmenuMenuitem * newroot, DbusmenuGtkMenu * menu) { - g_debug("Root changed"); if (newroot == NULL) { gtk_widget_hide(GTK_WIDGET(menu)); return; |