Don't send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)

Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
        send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)

diff --git a/ChangeLog b/ChangeLog
index 17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76..9ed2906dcf550e707bc64aeb866a21b28be406f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
+       send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)
+
 Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76..9ed2906dcf550e707bc64aeb866a21b28be406f7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
+       send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)
+
 Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76..9ed2906dcf550e707bc64aeb866a21b28be406f7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
+       send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)
+
 Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76..9ed2906dcf550e707bc64aeb866a21b28be406f7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
+       send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)
+
 Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76..9ed2906dcf550e707bc64aeb866a21b28be406f7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
+       send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)
+
 Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76..9ed2906dcf550e707bc64aeb866a21b28be406f7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
+       send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)
+
 Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76..9ed2906dcf550e707bc64aeb866a21b28be406f7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Jan 26 19:27:23 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (gtk_socket_grab_notify): Don't
+       send MODALITY_ON/OFF if socket->same_app (More fixes for #69735)
+
 Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 6b33ddaa9215c3247fda881b426d966bf107b36b..8c2deb198c9c2a692669dd58852a7dc20fa21c32 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -677,9 +677,12 @@ static void
 gtk_socket_grab_notify (GtkWidget *widget,
                        gboolean   was_grabbed)
 {
-  send_xembed_message (GTK_SOCKET (widget),
-                      was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON,
-                      0, 0, 0, gtk_get_current_event_time ());
+  GtkSocket *socket = GTK_SOCKET (widget);
+
+  if (!socket->same_app)
+    send_xembed_message (GTK_SOCKET (widget),
+                        was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON,
+                        0, 0, 0, gtk_get_current_event_time ());
 }
 
 static gboolean