summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-01-27 00:19:31 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-01-27 00:19:31 +0000
commit887c5ad8323deddcb46aade09f1937fac842c535 (patch)
treeba5c2f4343402959d01dd98463fd2ee9325cbf71
parent2ca60b920be228e0b13d4acd0aadd7af9f2fde64 (diff)
downloadgdk-pixbuf-887c5ad8323deddcb46aade09f1937fac842c535.tar.gz
Return FALSE not true in the grab_widget == NULL case. (Bug reported by
Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true in the grab_widget == NULL case. (Bug reported by Padraig O'Briain, #69735) * gtk/gtkplug.c (handle_modality_on): Realize the modality window so gtk_widget_event() doesn't complain :-((((.
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-2-09
-rw-r--r--ChangeLog.pre-2-109
-rw-r--r--ChangeLog.pre-2-29
-rw-r--r--ChangeLog.pre-2-49
-rw-r--r--ChangeLog.pre-2-69
-rw-r--r--ChangeLog.pre-2-89
-rw-r--r--gtk/gtkmain.c2
-rw-r--r--gtk/gtkplug.c1
9 files changed, 65 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0609e6a61..17f95cac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+ in the grab_widget == NULL case. (Bug reported by
+ Padraig O'Briain, #69735)
+
+ * gtk/gtkplug.c (handle_modality_on): Realize the modality
+ window so gtk_widget_event() doesn't complain :-((((.
+
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0609e6a61..17f95cac0 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+ in the grab_widget == NULL case. (Bug reported by
+ Padraig O'Briain, #69735)
+
+ * gtk/gtkplug.c (handle_modality_on): Realize the modality
+ window so gtk_widget_event() doesn't complain :-((((.
+
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0609e6a61..17f95cac0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+ in the grab_widget == NULL case. (Bug reported by
+ Padraig O'Briain, #69735)
+
+ * gtk/gtkplug.c (handle_modality_on): Realize the modality
+ window so gtk_widget_event() doesn't complain :-((((.
+
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0609e6a61..17f95cac0 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+ in the grab_widget == NULL case. (Bug reported by
+ Padraig O'Briain, #69735)
+
+ * gtk/gtkplug.c (handle_modality_on): Realize the modality
+ window so gtk_widget_event() doesn't complain :-((((.
+
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0609e6a61..17f95cac0 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+ in the grab_widget == NULL case. (Bug reported by
+ Padraig O'Briain, #69735)
+
+ * gtk/gtkplug.c (handle_modality_on): Realize the modality
+ window so gtk_widget_event() doesn't complain :-((((.
+
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0609e6a61..17f95cac0 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+ in the grab_widget == NULL case. (Bug reported by
+ Padraig O'Briain, #69735)
+
+ * gtk/gtkplug.c (handle_modality_on): Realize the modality
+ window so gtk_widget_event() doesn't complain :-((((.
+
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0609e6a61..17f95cac0 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+ in the grab_widget == NULL case. (Bug reported by
+ Padraig O'Briain, #69735)
+
+ * gtk/gtkplug.c (handle_modality_on): Realize the modality
+ window so gtk_widget_event() doesn't complain :-((((.
+
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b178bd929..a9c0dae3c 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1169,7 +1169,7 @@ check_is_grabbed (GtkWidget *widget,
if (grab_widget)
return !(widget == grab_widget || gtk_widget_is_ancestor (widget, grab_widget));
else
- return TRUE;
+ return FALSE;
}
static void
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 74b4f2a12..aff46e861 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -916,6 +916,7 @@ handle_modality_on (GtkPlug *plug)
if (!plug->modality_window)
{
plug->modality_window = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_widget_realize (plug->modality_window);
gtk_window_group_add_window (plug->modality_group, GTK_WINDOW (plug->modality_window));
gtk_grab_add (plug->modality_window);
}