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.

diff --git a/ChangeLog b/ChangeLog
index 06f580e27d1e1a56d0ef695100b9bf0b05724e56..0875a370448faa3e779da614f44f08021e1d0a5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 06f580e27d1e1a56d0ef695100b9bf0b05724e56..0875a370448faa3e779da614f44f08021e1d0a5a 100644 (file)
--- 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 06f580e27d1e1a56d0ef695100b9bf0b05724e56..0875a370448faa3e779da614f44f08021e1d0a5a 100644 (file)
--- 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 06f580e27d1e1a56d0ef695100b9bf0b05724e56..0875a370448faa3e779da614f44f08021e1d0a5a 100644 (file)
--- 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 06f580e27d1e1a56d0ef695100b9bf0b05724e56..0875a370448faa3e779da614f44f08021e1d0a5a 100644 (file)
--- 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 06f580e27d1e1a56d0ef695100b9bf0b05724e56..0875a370448faa3e779da614f44f08021e1d0a5a 100644 (file)
--- 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 06f580e27d1e1a56d0ef695100b9bf0b05724e56..0875a370448faa3e779da614f44f08021e1d0a5a 100644 (file)
--- 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 785e721b27e42889a6b24c60c22acc52f36d9ad6..360a4202d447166dda55b3deec73ebbee5883bfb 100644 (file)
--- 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;