[clutter/wip/backend-next: 8/8] backend: Fix up the input backend detection ordering

[Emmanuele Bassi <ebassi src gnome org>]

commit 042b5d9381308f238414c12a3181789c6c6602b5
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Nov 4 12:21:11 2011 +0000

    backend: Fix up the input backend detection ordering
    
    And add a missing 'else' in the OSX check, to avoid a g_error().

 clutter/clutter-backend.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 0eb065e..39846e1 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -272,20 +272,13 @@ clutter_backend_real_init_events (ClutterBackend *backend)
   if (input_backend != NULL)
     input_backend = g_intern_string (input_backend);
 
-#ifdef CLUTTER_INPUT_X11
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) &&
-      (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_X11)))
-    {
-      _clutter_backend_x11_events_init (backend);
-    }
-  else
-#endif
 #ifdef CLUTTER_INPUT_OSX
   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_OSX) &&
       (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_OSX)))
     {
       _clutter_backend_osx_events_init (backend);
     }
+  else
 #endif
 #ifdef CLUTTER_INPUT_WIN32
   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32) &&
@@ -295,6 +288,14 @@ clutter_backend_real_init_events (ClutterBackend *backend)
     }
   else
 #endif
+#ifdef CLUTTER_INPUT_X11
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) &&
+      (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_X11)))
+    {
+      _clutter_backend_x11_events_init (backend);
+    }
+  else
+#endif
 #ifdef CLUTTER_INPUT_GDK
   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK) &&
       (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_GDK)))