diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-17 16:35:54 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-17 16:35:54 +0000 |
| commit | 47b2b9dd190a19f4591e13d3d1c07f2e1d78070c (patch) | |
| tree | 7817d44ea68230098a993c292d2d573244dfa083 | |
| parent | ed3de17c517b3237f2f1cdc51194307b39969fe8 (diff) | |
| download | gdk-pixbuf-47b2b9dd190a19f4591e13d3d1c07f2e1d78070c.tar.gz | |
Complete the backported fix.
2005-08-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the
backported fix.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkmenu.c | 2 |
4 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2005-08-17 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the + backported fix. + 2005-08-15 Matthias Clasen <mclasen@redhat.com> Backported fixes from 2.8: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 22f03e7ef..b3080c569 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-17 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the + backported fix. + 2005-08-15 Matthias Clasen <mclasen@redhat.com> Backported fixes from 2.8: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 22f03e7ef..b3080c569 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-08-17 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_grab_notify): Complete the + backported fix. + 2005-08-15 Matthias Clasen <mclasen@redhat.com> Backported fixes from 2.8: diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index c598c8dcc..cb76063c4 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -4395,7 +4395,7 @@ gtk_menu_grab_notify (GtkWidget *widget, if (!was_grabbed) { - if (!GTK_IS_MENU (gtk_grab_get_current ())) + if (!GTK_IS_MENU_SHELL (grab)) gtk_menu_shell_cancel (GTK_MENU_SHELL (widget)); } } |