2007-09-10 Matthew Allum <mallum@openedhand.com>

        Port from stable branch.

        * clutter/eglnative/clutter-event-egl.c: (clutter_event_dispatch):
        Only declare tsevent if we have tslib (#498, Robert Bragg)

diff --git a/ChangeLog b/ChangeLog
index 9470634..d044ce4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-10  Matthew Allum  <mallum@openedhand.com>
+
+       Port from stable branch.
+
+       * clutter/eglnative/clutter-event-egl.c: (clutter_event_dispatch):
+       Only declare tsevent if we have tslib (#498, Robert Bragg)      
+
 2007-09-06  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter/clutter-stage.c: Remove stray include <gdk-pixbuf-xlib.h>

diff --git a/clutter/eglnative/clutter-event-egl.c b/clutter/eglnative/clutter-event-egl.c
index b1d7d58..1f15cae 100644 (file)
--- a/clutter/eglnative/clutter-event-egl.c
+++ b/clutter/eglnative/clutter-event-egl.c
@@ -187,7 +187,9 @@ clutter_event_dispatch (GSource     *source,
   ClutterBackend     *backend = ((ClutterEventSource *) source)->backend;
   ClutterEventSource *event_source = (ClutterEventSource *) source;
   ClutterEvent       *event;
+#ifdef HAVE_TSLIB
   struct ts_sample    tsevent;
+#endif
   ClutterMainContext *clutter_context;
   static gint         last_x, last_y;