diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-29 14:51:17 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-29 14:51:17 +0000 |
| commit | 20816d91eb01bef59efb4dea91ffe1b1637cbe5a (patch) | |
| tree | f580cdb0511ec96c8737117b52406a187429a525 | |
| parent | 47daaa2e8816e415d303732e67f7ad726e72deb5 (diff) | |
| download | gdk-pixbuf-20816d91eb01bef59efb4dea91ffe1b1637cbe5a.tar.gz | |
Only cancel if the menu was active. (#314298, Christian Persch, analysis
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)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkmenu.c | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,5 +1,10 @@ 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> + * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an accidentally leftover duplicate pixbuf creation. (#314700, Kjartan Maraas) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ca9df5b1a..1f3150bb3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 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> + * gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an accidentally leftover duplicate pixbuf creation. (#314700, Kjartan Maraas) diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index de23fe7f6..5896e871f 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -4419,7 +4419,7 @@ gtk_menu_grab_notify (GtkWidget *widget, 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)); } } |