Mailing List Archive

Author: aendrodi
Date: 2009-09-01 11:17:31 +0300 (Tue, 01 Sep 2009)
New Revision: 19276

Modified:
projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c
projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11.h
Log:
reverting NB#134557 "fixes the crash" patch


Modified: projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c 2009-08-31 14:09:29 UTC (rev 19275)
+++ projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c 2009-09-01 08:17:31 UTC (rev 19276)
@@ -62,8 +62,6 @@
#define XEMBED_UNREGISTER_ACCELERATOR 13
#define XEMBED_ACTIVATE_ACCELERATOR 14

-gboolean clutter_x11_event_processing_blocked;
-
static Window ParentEmbedderWin = None;

typedef struct _ClutterEventSource ClutterEventSource;
@@ -818,16 +816,9 @@
Display *xdisplay = backend_x11->xdpy;
XEvent xevent;
ClutterMainContext *clutter_context;
- static GTimer *timer;

clutter_context = clutter_context_get_default ();

- /* Observe the elapsed time we spend on event processing not to starve
- * g_timeout_add() callbacks to death. */
- if (!timer)
- timer = g_timer_new ();
- g_timer_start (timer);
-
while (!clutter_events_pending () && XPending (xdisplay))
{
XNextEvent (xdisplay, &xevent);
@@ -843,10 +834,6 @@
{
clutter_event_free (event);
}
-
- /* Take a break every 40 milisecs. */
- if (g_timer_elapsed (timer, NULL) >= 0.04)
- break;
}
}

@@ -910,10 +897,7 @@
clutter_threads_enter ();

*timeout = -1;
- if (clutter_x11_event_processing_blocked)
- retval = FALSE;
- else
- retval = (clutter_events_pending () || check_xpending (backend));
+ retval = (clutter_events_pending () || check_xpending (backend));

clutter_threads_leave ();

@@ -929,9 +913,7 @@

clutter_threads_enter ();

- if (clutter_x11_event_processing_blocked)
- retval = FALSE;
- else if (event_source->event_poll_fd.revents & G_IO_IN)
+ if (event_source->event_poll_fd.revents & G_IO_IN)
retval = (clutter_events_pending () || check_xpending (backend));
else
retval = FALSE;

Modified: projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11.h
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11.h 2009-08-31 14:09:29 UTC (rev 19275)
+++ projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11.h 2009-09-01 08:17:31 UTC (rev 19276)
@@ -134,15 +134,6 @@

gboolean clutter_x11_has_composite_extension (void);

-/**
- * clutter_x11_event_processing_blocked:
- *
- * As long as %TRUE the X11 backend won't start processing any new X events.
- * Useful when you want to spin clutter_main() in an event filter function
- * and would mind reentering it.
- */
-extern gboolean clutter_x11_event_processing_blocked;
-
G_END_DECLS

#endif /* __CLUTTER_X11_H__ */

_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits