diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2014-08-15 12:11:20 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2014-08-15 12:11:20 +0100 |
| commit | be8602fbb491c30c1e2febb92553375b2f4ce584 (patch) | |
| tree | 4feed0c50dcd895b02b03b4191195bcce34dec4a | |
| parent | f12c174d721f39a19beb782586665d0ce3f6e350 (diff) | |
| download | clutter-be8602fbb491c30c1e2febb92553375b2f4ce584.tar.gz | |
Revert "backend: try gdk backend before x11/wayland/egl"
This reverts commit 398a7ac71333208e31d67f3ce50514fab58ba1bb.
We cannot really use the GDK backend without massive regressions inside
the input layer, like touch events and gestures. The GDK backend is not
entirely up to scratch, and it's late in the cycle.
Let's land this early in 3.15, and get it up to par with X11.
| -rw-r--r-- | clutter/clutter-backend.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index 4b1795602..d255eee8b 100644 --- a/clutter/clutter-backend.c +++ b/clutter/clutter-backend.c @@ -491,11 +491,6 @@ _clutter_create_backend (void) retval = g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL); else #endif -#ifdef CLUTTER_WINDOWING_GDK - if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK)) - retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL); - else -#endif #ifdef CLUTTER_WINDOWING_X11 if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11)) retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL); @@ -511,6 +506,11 @@ _clutter_create_backend (void) retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL); else #endif +#ifdef CLUTTER_WINDOWING_GDK + if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK)) + retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL); + else +#endif if (backend == NULL) g_error ("No default Clutter backend found."); else |