diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-02-03 00:18:41 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-03 00:18:41 +0000 |
| commit | 0ed21b67d92d659f33ccedc96549527af5bf7386 (patch) | |
| tree | de0f293bf0218c11badee848820a3abb07a5e598 | |
| parent | d6622d38d6f460d84f571669a2081a8fd3024f11 (diff) | |
| download | gtk+-0ed21b67d92d659f33ccedc96549527af5bf7386.tar.gz | |
Fix some bugs in the determination of xgrab_shell.
Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in
the determination of xgrab_shell.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkmenu.c | 2 |
8 files changed, 36 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in + the determination of xgrab_shell. + Sat Feb 2 17:43:00 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_grab_focus): Add a GtkSetting diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 06f580e27d..0875a37044 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in + the determination of xgrab_shell. + Sat Feb 2 17:43:00 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_grab_focus): Add a GtkSetting diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 06f580e27d..0875a37044 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in + the determination of xgrab_shell. + Sat Feb 2 17:43:00 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_grab_focus): Add a GtkSetting diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 06f580e27d..0875a37044 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in + the determination of xgrab_shell. + Sat Feb 2 17:43:00 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_grab_focus): Add a GtkSetting diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 06f580e27d..0875a37044 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in + the determination of xgrab_shell. + Sat Feb 2 17:43:00 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_grab_focus): Add a GtkSetting diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 06f580e27d..0875a37044 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in + the determination of xgrab_shell. + Sat Feb 2 17:43:00 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_grab_focus): Add a GtkSetting diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 06f580e27d..0875a37044 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Feb 2 19:15:42 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkmenu.c (gtk_menu_popup): Fix some bugs in + the determination of xgrab_shell. + Sat Feb 2 17:43:00 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_grab_focus): Add a GtkSetting diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 785e721b27..360a4202d4 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -688,7 +688,7 @@ gtk_menu_popup (GtkMenu *menu, * probably could just leave the grab on the other window, with a * little reorganization of the code in gtkmenu*). */ - if (xgrab_shell == widget) + if (xgrab_shell && xgrab_shell != widget) { if (popup_grab_on_window (xgrab_shell->window, activate_time)) GTK_MENU_SHELL (xgrab_shell)->have_xgrab = TRUE; |