diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 11:24:45 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 11:24:45 -0600 |
| commit | f0c24c976f319d0b087adc0c8bc694cf930aa30b (patch) | |
| tree | cc1d6a425b2d5c8c5625d010cb027953d6289751 /libdbusmenu-gtk/client.c | |
| parent | 9e1c8319da6ac98bd36b73c4d46d7b655778ed9d (diff) | |
| parent | b3768eaec11202758801a3dd0f94a2ab315f4a0d (diff) | |
| download | libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.gz libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.bz2 libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.zip | |
Import upstream version 0.3.90
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 6970d59..bba4550 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -37,13 +37,11 @@ License version 3 and version 2.1 along with this program. If not, see #include "genericmenuitem.h" /* Private */ -typedef struct _DbusmenuGtkClientPrivate DbusmenuGtkClientPrivate; struct _DbusmenuGtkClientPrivate { GtkAccelGroup * agroup; }; -#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate)) +#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) (DBUSMENU_GTKCLIENT(o)->priv) /* Prototypes */ static void dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass); @@ -85,6 +83,8 @@ dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass) static void dbusmenu_gtkclient_init (DbusmenuGtkClient *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate); + DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(self); priv->agroup = NULL; @@ -454,11 +454,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); } |