From 60dbeb9425f51fc602ba2fe89b2a968ef4b527ed Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 11 Jan 2015 16:48:47 +0000 Subject: [PATCH] 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 --- clutter/clutter-backend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index d255eee8b..4b1795602 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); @@ -505,11 +510,6 @@ _clutter_create_backend (void) if (backend == NULL || backend == I_(CLUTTER_WINDOWING_EGL)) 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.");