diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-01 20:13:48 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-01 20:13:48 -0600 |
| commit | 5c3f84012f814438bb6b40488d943620a2df72c9 (patch) | |
| tree | ce8abb74752aa2b6ab08916044b551bb42766ddd /libdbusmenu-gtk/client.c | |
| parent | 0ac0a85f42be1aa1c93cfc42a0b4d455f594ba2c (diff) | |
| parent | b3768eaec11202758801a3dd0f94a2ab315f4a0d (diff) | |
| download | libdbusmenu-5c3f84012f814438bb6b40488d943620a2df72c9.tar.gz libdbusmenu-5c3f84012f814438bb6b40488d943620a2df72c9.tar.bz2 libdbusmenu-5c3f84012f814438bb6b40488d943620a2df72c9.zip | |
Merging in trunk changes for dual build and GTK3 fixes
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 77935c5..6c60530 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -444,11 +444,17 @@ activate_helper (GtkMenuShell * shell) activate_helper(GTK_MENU_SHELL(parent)); } + /* This code is being commented out for GTK 3 because it + doesn't expose the right variables. We need to figure + this out as menus won't get grabs properly. + TODO FIXME HELP ARGHHHHHHHH */ +#if (HAVE_GTK3 == 0) if (!GTK_MENU_SHELL (parent)->active) { gtk_grab_add (parent); GTK_MENU_SHELL (parent)->have_grab = TRUE; GTK_MENU_SHELL (parent)->active = TRUE; } +#endif gtk_menu_shell_select_item(GTK_MENU_SHELL(parent), attach); } |