summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-07-07 19:05:33 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-07-07 19:05:33 +0000
commit5a997f0f37b8ecf340f887659366802c14afea46 (patch)
treed63bc921ece9bdf81fc519f4fb3708e80f9b761b
parent1df38871e11625b11d7dbd22fae4b1328946b76a (diff)
downloadgdk-pixbuf-5a997f0f37b8ecf340f887659366802c14afea46.tar.gz
Don't generate events on destroyed windows.
2005-07-07 Matthias Clasen <mclasen@redhat.com> * gdk/x11/gdkmain-x11.c (generate_grab_broken_event): Don't generate events on destroyed windows.
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--ChangeLog.pre-2-83
-rw-r--r--gdk/x11/gdkmain-x11.c21
4 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ea0ef9218..8d972b765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-07-07 Matthias Clasen <mclasen@redhat.com>
+ * gdk/x11/gdkmain-x11.c (generate_grab_broken_event): Don't
+ generate events on destroyed windows.
+
Implement Drag-and-Drop to the file list. (#145121, Sven Neumann)
* gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ea0ef9218..8d972b765 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
2005-07-07 Matthias Clasen <mclasen@redhat.com>
+ * gdk/x11/gdkmain-x11.c (generate_grab_broken_event): Don't
+ generate events on destroyed windows.
+
Implement Drag-and-Drop to the file list. (#145121, Sven Neumann)
* gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ea0ef9218..8d972b765 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
2005-07-07 Matthias Clasen <mclasen@redhat.com>
+ * gdk/x11/gdkmain-x11.c (generate_grab_broken_event): Don't
+ generate events on destroyed windows.
+
Implement Drag-and-Drop to the file list. (#145121, Sven Neumann)
* gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb)
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 985b2b5dc..9b8ee9554 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -143,16 +143,19 @@ generate_grab_broken_event (GdkWindow *window,
gboolean implicit,
GdkWindow *grab_window)
{
- GdkEvent event;
+ if (!GDK_WINDOW_DESTROYED (window))
+ {
+ GdkEvent event;
- event.type = GDK_GRAB_BROKEN;
- event.grab_broken.window = window;
- event.grab_broken.send_event = 0;
- event.grab_broken.keyboard = keyboard;
- event.grab_broken.implicit = implicit;
- event.grab_broken.grab_window = grab_window;
-
- gdk_event_put (&event);
+ event.type = GDK_GRAB_BROKEN;
+ event.grab_broken.window = window;
+ event.grab_broken.send_event = 0;
+ event.grab_broken.keyboard = keyboard;
+ event.grab_broken.implicit = implicit;
+ event.grab_broken.grab_window = grab_window;
+
+ gdk_event_put (&event);
+ }
}
/*