diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2011-11-04 12:21:11 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-11-10 14:42:40 +0000 |
| commit | 5b1b936491c89b75c211584e77946d3dea0c5f81 (patch) | |
| tree | cd457e1b5fd8daa0dbe88647ec87293a01485158 /clutter/clutter-backend.c | |
| parent | 1f8915d2c89cced191fbd94bdb5dd6833d942584 (diff) | |
| download | clutter-5b1b936491c89b75c211584e77946d3dea0c5f81.tar.gz | |
backend: Fix up the input backend detection ordering
And add a missing 'else' in the OSX check, to avoid a g_error().
Diffstat (limited to 'clutter/clutter-backend.c')
| -rw-r--r-- | 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 0eb065e0e..39846e1c9 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))) |