AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Only cancel if the menu was active. (#314298, Christian Persch, analysis

Browse Source 
2005-08-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu
	was active.  (#314298, Christian Persch, analysis by Mark McLoughlin)
This commit is contained in:
Matthias Clasen 2005-08-29 14:53:45 +00:00 committed by Matthias Clasen
parent e7f084dcf2
commit 9eb5ea7dd3
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu
was active. (#314298, Christian Persch, analysis by Mark McLoughlin)
2005-08-29 Matthias Clasen <mclasen@redhat.com> 2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_grab_notify): Only cancel if the menu
was active. (#314298, Christian Persch, analysis by Mark McLoughlin)
2005-08-29 Matthias Clasen <mclasen@redhat.com> 2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an

2
gtk/gtkmenu.c
View File

@ -4419,7 +4419,7 @@ gtk_menu_grab_notify (GtkWidget *widget,
if (!was_grabbed) if (!was_grabbed)
{ {
if (!GTK_IS_MENU_SHELL (grab)) if (GTK_MENU_SHELL (widget)->active && !GTK_IS_MENU_SHELL (grab))
gtk_menu_shell_cancel (GTK_MENU_SHELL (widget)); gtk_menu_shell_cancel (GTK_MENU_SHELL (widget));
} }
} }