sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

backend: Fix up the input backend detection ordering

Browse source 
And add a missing 'else' in the OSX check, to avoid a g_error().
This commit is contained in:
Emmanuele Bassi 2011-11-04 12:21:11 +00:00 committed by Emmanuele Bassi
parent 1f8915d2c8
commit 5b1b936491
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clutter/clutter-backend.c
View file

@ -272,20 +272,13 @@ clutter_backend_real_init_events (ClutterBackend *backend)
if (input_backend != NULL) if (input_backend != NULL)
input_backend = g_intern_string (input_backend); 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 #ifdef CLUTTER_INPUT_OSX
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_OSX) && if (clutter_check_windowing_backend (CLUTTER_WINDOWING_OSX) &&
(input_backend == NULL || input_backend == I_(CLUTTER_INPUT_OSX))) (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_OSX)))
{ {
_clutter_backend_osx_events_init (backend); _clutter_backend_osx_events_init (backend);
} }
else
#endif #endif
#ifdef CLUTTER_INPUT_WIN32 #ifdef CLUTTER_INPUT_WIN32
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32) && if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32) &&
@ -295,6 +288,14 @@ clutter_backend_real_init_events (ClutterBackend *backend)
} }
else else
#endif #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 #ifdef CLUTTER_INPUT_GDK
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK) && if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK) &&
(input_backend == NULL || input_backend == I_(CLUTTER_INPUT_GDK))) (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_GDK)))