diff options
| author | Ted Gould <ted@canonical.com> | 2009-06-24 21:27:10 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-06-24 21:27:10 -0500 |
| commit | 8d75067ada03ed13fcb183987f8392c18afd4992 (patch) | |
| tree | 8a6f63cb3c82df11016910bd9e2ed8926c3b2dab | |
| parent | d4503d1336b547db4b8cbdd8de75c01898eceff5 (diff) | |
| download | libdbusmenu-8d75067ada03ed13fcb183987f8392c18afd4992.tar.gz libdbusmenu-8d75067ada03ed13fcb183987f8392c18afd4992.tar.bz2 libdbusmenu-8d75067ada03ed13fcb183987f8392c18afd4992.zip | |
Handling the differing signals to set things up with the various gtk widgets
| -rw-r--r-- | libdbusmenu-gtk/client.c | 41 | ||||
| -rw-r--r-- | libdbusmenu-gtk/client.h | 1 |
2 files changed, 39 insertions, 3 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 9657c28..99e41bf 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -125,7 +125,16 @@ destoryed_dbusmenuitem_cb (gpointer udata, GObject * dbusmenuitem) static void new_menuitem (DbusmenuClient * client, DbusmenuMenuitem * mi, gpointer userdata) { - GtkWidget * gmi = gtk_menu_item_new(); + gpointer ann_mi = g_object_get_data(G_OBJECT(mi), data_menuitem); + GtkMenuItem * gmi = GTK_MENU_ITEM(ann_mi); + + if (gmi != NULL) { + /* It's possible we've already been looked at, that's + okay, but we can just ignore this signal then. */ + return; + } + + gmi = GTK_MENU_ITEM(gtk_menu_item_new()); /* Attach these two */ g_object_set_data(G_OBJECT(mi), data_menuitem, gmi); @@ -149,17 +158,34 @@ static void new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position, gpointer userdata) { gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); - if (ann_menu == NULL) { + GtkMenu * menu = GTK_MENU(ann_menu); + if (menu == NULL) { /* Oh, we don't have a submenu, build one! */ + menu = GTK_MENU(gtk_menu_new()); + g_object_set_data(G_OBJECT(mi), data_menu, menu); - } + GtkMenuItem * parent = dbusmenu_gtkclient_menuitem_get (mi); + gtk_menu_item_set_submenu(parent, GTK_WIDGET(menu)); + } + GtkMenuItem * childmi = dbusmenu_gtkclient_menuitem_get (child); + gtk_menu_shell_insert(GTK_MENU_SHELL(menu), GTK_WIDGET(childmi), position); + return; } static void delete_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, gpointer userdata) { + if (g_list_length(dbusmenu_menuitem_get_children(mi)) == 0) { + gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); + GtkMenu * menu = GTK_MENU(ann_menu); + + if (menu != NULL) { + gtk_widget_destroy(GTK_WIDGET(menu)); + g_object_set_data(G_OBJECT(mi), data_menu, NULL); + } + } return; } @@ -173,6 +199,9 @@ move_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint new, guint ol return; } + GtkMenuItem * childmi = dbusmenu_gtkclient_menuitem_get (child); + gtk_menu_reorder_child(GTK_MENU(ann_menu), GTK_WIDGET(childmi), new); + return; } @@ -197,3 +226,9 @@ dbusmenu_gtkclient_new (gchar * dbus_name, gchar * dbus_object) NULL); } +GtkMenuItem * +dbusmenu_gtkclient_menuitem_get (DbusmenuMenuitem * item) +{ + return GTK_MENU_ITEM(g_object_get_data(G_OBJECT(item), data_menuitem)); +} + diff --git a/libdbusmenu-gtk/client.h b/libdbusmenu-gtk/client.h index 96846a4..3c0117a 100644 --- a/libdbusmenu-gtk/client.h +++ b/libdbusmenu-gtk/client.h @@ -77,6 +77,7 @@ struct _DbusmenuGtkClient { GType dbusmenu_gtkclient_get_type (void); DbusmenuGtkClient * dbusmenu_gtkclient_new (gchar * dbus_name, gchar * dbus_object); +GtkMenuItem * dbusmenu_gtkclient_menuitem_get (DbusmenuMenuitem * item); /** SECTION:gtkmenu |