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.

diff --git a/ChangeLog b/ChangeLog
index 3b7525328b596344640a09922fa4fd4b10e68c9e..3870762c6e4fa8519522783fa2e327415a85fefb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Do nothing

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3b7525328b596344640a09922fa4fd4b10e68c9e..3870762c6e4fa8519522783fa2e327415a85fefb 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+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.
+
 Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Do nothing

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3b7525328b596344640a09922fa4fd4b10e68c9e..3870762c6e4fa8519522783fa2e327415a85fefb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+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.
+
 Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Do nothing

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3b7525328b596344640a09922fa4fd4b10e68c9e..3870762c6e4fa8519522783fa2e327415a85fefb 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+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.
+
 Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Do nothing

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3b7525328b596344640a09922fa4fd4b10e68c9e..3870762c6e4fa8519522783fa2e327415a85fefb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+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.
+
 Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Do nothing

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3b7525328b596344640a09922fa4fd4b10e68c9e..3870762c6e4fa8519522783fa2e327415a85fefb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+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.
+
 Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Do nothing

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3b7525328b596344640a09922fa4fd4b10e68c9e..3870762c6e4fa8519522783fa2e327415a85fefb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+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.
+
 Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Do nothing

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 1c1ebc0ad4bd94ddbe588006cdb7b57c8ea30025..d3f7144b3c1a1ab150ddfa09f96b391a75b29230 100644 (file)
--- 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 1c1ebc0ad4bd94ddbe588006cdb7b57c8ea30025..d3f7144b3c1a1ab150ddfa09f96b391a75b29230 100644 (file)
--- 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;