Commit 59e481fa authored by Søren Sandmann's avatar Søren Sandmann Committed by Søren Sandmann Pedersen
Browse files

Revert accidental change from Aug 02 that removed a flush of the X

Sat Sep  4 16:51:00 2004  Søren Sandmann  <sandmann@redhat.com>

	* gdk/x11/gdkevents-x11.c (gdk_event_prepare): Revert accidental
	change from Aug 02 that removed a flush of the X connection from
	gdk_event_prepare() causing applications to get stuck. (#151732,
	Richard Hoelscher).
parent 3636328e
Sat Sep 4 16:51:00 2004 Søren Sandmann <sandmann@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_prepare): Revert accidental
change from Aug 02 that removed a flush of the X connection from
gdk_event_prepare() causing applications to get stuck. (#151732,
Richard Hoelscher).
Fri Sep 3 22:45:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (print_node): Don't print out attributes
......
Sat Sep 4 16:51:00 2004 Søren Sandmann <sandmann@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_prepare): Revert accidental
change from Aug 02 that removed a flush of the X connection from
gdk_event_prepare() causing applications to get stuck. (#151732,
Richard Hoelscher).
Fri Sep 3 22:45:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (print_node): Don't print out attributes
......
Sat Sep 4 16:51:00 2004 Søren Sandmann <sandmann@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_prepare): Revert accidental
change from Aug 02 that removed a flush of the X connection from
gdk_event_prepare() causing applications to get stuck. (#151732,
Richard Hoelscher).
Fri Sep 3 22:45:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (print_node): Don't print out attributes
......
Sat Sep 4 16:51:00 2004 Søren Sandmann <sandmann@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_prepare): Revert accidental
change from Aug 02 that removed a flush of the X connection from
gdk_event_prepare() causing applications to get stuck. (#151732,
Richard Hoelscher).
Fri Sep 3 22:45:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (print_node): Don't print out attributes
......
......@@ -2151,13 +2151,6 @@ _gdk_events_queue (GdkDisplay *display)
}
}
static gboolean
has_events_already (GdkDisplay *display)
{
gboolean r = XEventsQueued (GDK_DISPLAY_XDISPLAY (display), QueuedAlready);
return r;
}
static gboolean
gdk_event_prepare (GSource *source,
gint *timeout)
......@@ -2169,7 +2162,7 @@ gdk_event_prepare (GSource *source,
*timeout = -1;
retval = (_gdk_event_queue_find_first (display) != NULL ||
has_events_already (display));
gdk_check_xpending (display));
GDK_THREADS_LEAVE ();
......@@ -2206,15 +2199,15 @@ gdk_event_dispatch (GSource *source,
GDK_THREADS_ENTER ();
_gdk_events_queue (display);
event = _gdk_event_unqueue (display);
if (event)
{
if (_gdk_event_func)
(*_gdk_event_func) (event, _gdk_event_data);
gdk_event_free (event);
}
}
GDK_THREADS_LEAVE ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment