diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-14 23:53:11 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-14 23:53:11 -0500 |
| commit | 764876064692680897cbf76435085d67ed25436e (patch) | |
| tree | cc2bc7008cedfc12c5cccf8af2b0e58a0092969b /libdbusmenu-gtk | |
| parent | e1d826fcfb9bb619cf69e16f72616d8e396cc494 (diff) | |
| parent | 9931bb8eddce86cae0896285b19a5830079923b8 (diff) | |
| download | libdbusmenu-764876064692680897cbf76435085d67ed25436e.tar.gz libdbusmenu-764876064692680897cbf76435085d67ed25436e.tar.bz2 libdbusmenu-764876064692680897cbf76435085d67ed25436e.zip | |
* Upstream Merge
* Changing GTK layer to look at position in realized
children to avoid realization races.
Diffstat (limited to 'libdbusmenu-gtk')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 2 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 3de42fe..eabfa9b 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; diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 103ecfe..409b7ed 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -300,7 +300,7 @@ child_realized (DbusmenuMenuitem * child, gpointer userdata) if (child_widget != NULL) { gtk_menu_append(menu, child_widget); - gtk_menu_reorder_child(GTK_MENU(menu), child_widget, dbusmenu_menuitem_get_position(child, dbusmenu_client_get_root(DBUSMENU_CLIENT(priv->client)))); + gtk_menu_reorder_child(GTK_MENU(menu), child_widget, dbusmenu_menuitem_get_position_realized(child, dbusmenu_client_get_root(DBUSMENU_CLIENT(priv->client)))); } else { g_warning("Child is realized, but doesn't have a GTK Widget!"); } |