diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-15 01:23:10 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-15 01:23:10 -0500 |
| commit | 490c7b4de7274d4c0c3529ff01bacb829d6aa4c8 (patch) | |
| tree | 4b1fa3f794991102ea5a085df14b6a293b690a7b /libdbusmenu-gtk/client.c | |
| parent | b76efc8297f488efce9e4fddf9e705c75a27065e (diff) | |
| parent | 7bf97e72be70cf02997eca526aaac68df4494165 (diff) | |
| download | libdbusmenu-490c7b4de7274d4c0c3529ff01bacb829d6aa4c8.tar.gz libdbusmenu-490c7b4de7274d4c0c3529ff01bacb829d6aa4c8.tar.bz2 libdbusmenu-490c7b4de7274d4c0c3529ff01bacb829d6aa4c8.zip | |
* Upstream Merge
* Changing GTK layer to look at position in realized
children to avoid realization races. (LP: #555816)
* Don't allow setting children twice
* Ref children of a menuitem
* Return error when parent ID of getlayout can't be found
* Adding in visible property to docs
* Helpful comments in the code
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 3de42fe..b13af6a 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -308,7 +308,7 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * /* Oh, we're a child, let's deal with that */ if (parent != NULL) { - new_child(parent, item, dbusmenu_menuitem_get_position(item, parent), DBUSMENU_GTKCLIENT(client)); + new_child(parent, item, dbusmenu_menuitem_get_position_realized(item, parent), DBUSMENU_GTKCLIENT(client)); } return; @@ -335,7 +335,7 @@ new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position, Dbus } GtkMenuItem * childmi = dbusmenu_gtkclient_menuitem_get(gtkclient, child); - gtk_menu_shell_insert(GTK_MENU_SHELL(menu), GTK_WIDGET(childmi), position); + gtk_menu_shell_insert(GTK_MENU_SHELL(menu), GTK_WIDGET(childmi), dbusmenu_menuitem_get_position_realized(child, mi)); gtk_widget_show(GTK_WIDGET(menu)); return; @@ -373,7 +373,7 @@ move_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint new, guint ol } GtkMenuItem * childmi = dbusmenu_gtkclient_menuitem_get(gtkclient, child); - gtk_menu_reorder_child(GTK_MENU(ann_menu), GTK_WIDGET(childmi), new); + gtk_menu_reorder_child(GTK_MENU(ann_menu), GTK_WIDGET(childmi), dbusmenu_menuitem_get_position_realized(child, mi)); return; } |