summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2015-01-11 16:48:47 (GMT)
committerEmmanuele Bassi <ebassi@gnome.org>2015-01-11 16:48:47 (GMT)
commit60dbeb9425f51fc602ba2fe89b2a968ef4b527ed (patch)
tree3cec0c4fd0d2611d6d6ec6d392828dd359e4a978
parent7b9068b976dc40be419982a7e8b0c299c21e9f51 (diff)
downloadclutter-60dbeb9425f51fc602ba2fe89b2a968ef4b527ed.zip
clutter-60dbeb9425f51fc602ba2fe89b2a968ef4b527ed.tar.xz
Try again at using the GDK backend by default
We tried once with commit 398a7ac7 and ended up reverting because of regressions in the input layer and on Wayland. We should try again, now that those regressions have been fixed. https://bugzilla.gnome.org/show_bug.cgi?id=734587
-rw-r--r--clutter/clutter-backend.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index d255eee..4b17956 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -491,6 +491,11 @@ _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);
@@ -506,11 +511,6 @@ _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