summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1998-12-16 21:58:54 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-12-16 21:58:54 +0000
commit45cdd91a8c6e64f12501f212ed46899866532330 (patch)
tree0d5787141cb2fb09a9b6eededd094e62f8fe72bd /gdk
parentb4ba8e3b5d7d0b9d1defd9b10c724ae059cb25cc (diff)
downloadgtk+-45cdd91a8c6e64f12501f212ed46899866532330.tar.gz
Don't call XPending() if we have putback events.
Wed Dec 16 16:57:55 1998 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_events_queue): Don't call XPending() if we have putback events.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdkevents.c2
-rw-r--r--gdk/x11/gdkevents-x11.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 1c1ebc0ad4..d3f7144b3c 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1836,7 +1836,7 @@ gdk_events_queue (void)
GdkEvent *event;
XEvent xevent;
- while (!queued_events && XPending (gdk_display))
+ while (!(putback_events || queued_events) && XPending (gdk_display))
{
#ifdef USE_XIM
Window w = None;
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 1c1ebc0ad4..d3f7144b3c 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1836,7 +1836,7 @@ gdk_events_queue (void)
GdkEvent *event;
XEvent xevent;
- while (!queued_events && XPending (gdk_display))
+ while (!(putback_events || queued_events) && XPending (gdk_display))
{
#ifdef USE_XIM
Window w = None;