[clutter] x11/event: Avoid compiler warnings with HAVE_XGE undefined
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] x11/event: Avoid compiler warnings with HAVE_XGE undefined
- Date: Fri, 15 Jul 2011 15:11:18 +0000 (UTC)
commit bc1c3e003d745dbaa95ecd161b83df0881e18cc6
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Fri Jul 15 16:03:00 2011 +0100
x11/event: Avoid compiler warnings with HAVE_XGE undefined
clutter/x11/clutter-event-x11.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c
index 432ae9f..3842b87 100644
--- a/clutter/x11/clutter-event-x11.c
+++ b/clutter/x11/clutter-event-x11.c
@@ -243,6 +243,7 @@ events_queue (ClutterBackend *backend)
#ifdef HAVE_XGE
XGetEventData (xdisplay, &xevent.xcookie);
#endif
+
if (_clutter_backend_translate_event (backend, &xevent, event))
_clutter_event_push (event, FALSE);
else
@@ -280,11 +281,11 @@ clutter_x11_handle_event (XEvent *xevent)
{
ClutterX11FilterReturn result;
ClutterBackend *backend;
- ClutterBackendX11 *backend_x11;
- Display *xdisplay;
ClutterEvent *event;
gint spin = 1;
#ifdef HAVE_XGE
+ ClutterBackendX11 *backend_x11;
+ Display *xdisplay;
gboolean allocated_event;
#endif
@@ -302,12 +303,13 @@ clutter_x11_handle_event (XEvent *xevent)
clutter_threads_enter ();
backend = clutter_get_default_backend ();
- backend_x11 = CLUTTER_BACKEND_X11 (backend);
- xdisplay = backend_x11->xdpy;
event = clutter_event_new (CLUTTER_NOTHING);
#ifdef HAVE_XGE
+ backend_x11 = CLUTTER_BACKEND_X11 (backend);
+ xdisplay = backend_x11->xdpy;
+
allocated_event = XGetEventData (xdisplay, &xevent->xcookie);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]