From cbb0f2c5ae4381b2627fcfb9fe7a57d80460ec44 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 30 Aug 2010 16:13:06 -0400 Subject: Grab your junk. --- libdbusmenu-gtk/client.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 44f95fe..72f5b0b 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -447,18 +447,26 @@ activate_helper (GtkMenuShell * shell) GtkWidget * attach = gtk_menu_get_attach_widget(GTK_MENU(shell)); if (attach != NULL) { - GtkWidget * parent = gtk_widget_get_parent(GTK_WIDGET(attach)); + GtkWidget * parent = gtk_widget_get_parent(attach); + GtkWidget *toplevel = gtk_widget_get_toplevel (attach); if (parent != NULL) { if (GTK_IS_MENU(parent)) { activate_helper(GTK_MENU_SHELL(parent)); } + + if (!GTK_MENU_SHELL (parent)->active) { + gtk_grab_add (parent); + GTK_MENU_SHELL (parent)->have_grab = TRUE; + GTK_MENU_SHELL (parent)->active = TRUE; + } + gtk_menu_shell_select_item(GTK_MENU_SHELL(parent), attach); } } } - return; + return; } /* Signaled when we should show a menuitem at request of the application -- cgit v1.2.3 From 95d4df8bfd7c9a2aa87be499460507b29f947478 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Sep 2010 09:40:37 -0500 Subject: 0.3.13 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5ccf9c3..792d065 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.3.12, ted@canonical.com) +AC_INIT(libdbusmenu, 0.3.13, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.3.12, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.3.13, [-Wno-portability]) AM_MAINTAINER_MODE @@ -99,7 +99,7 @@ AC_PATH_PROG([VALA_API_GEN], [vapigen]) ########################### LIBDBUSMENU_CURRENT=1 -LIBDBUSMENU_REVISION=14 +LIBDBUSMENU_REVISION=15 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) -- cgit v1.2.3