diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-02-12 22:07:37 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-02-12 22:09:58 +0100 |
| commit | 33a46dd55310b7d668876568eadcdcd2af6a75f1 (patch) | |
| tree | 39bcf5afc94625367154fbf80bbd55664bad9c53 | |
| parent | 9f5c734e146baac0d21dfacf2b757f8dfaf6aed9 (diff) | |
| download | gtk+-33a46dd55310b7d668876568eadcdcd2af6a75f1.tar.gz | |
gdk: Select the X11 backend a the last possible backend
On Windows and OS X we want to prefer the native backends over the X11
backend.
On Linux, nothing changes as nobody is going to enable those backends
(and if they do, they'll know what they get).
| -rw-r--r-- | gdk/gdkdisplaymanager.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 508d60910b..1c442045f9 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -225,11 +225,6 @@ gdk_display_manager_get (void) const gchar *backend; backend = g_getenv ("GDK_BACKEND"); -#ifdef GDK_WINDOWING_X11 - if (backend == NULL || strcmp (backend, "x11") == 0) - manager = g_object_new (gdk_x11_display_manager_get_type (), NULL); - else -#endif #ifdef GDK_WINDOWING_QUARTZ if (backend == NULL || strcmp (backend, "quartz") == 0) manager = g_object_new (gdk_quartz_display_manager_get_type (), NULL); @@ -240,6 +235,11 @@ gdk_display_manager_get (void) manager = g_object_new (gdk_win32_display_manager_get_type (), NULL); else #endif +#ifdef GDK_WINDOWING_X11 + if (backend == NULL || strcmp (backend, "x11") == 0) + manager = g_object_new (gdk_x11_display_manager_get_type (), NULL); + else +#endif if (backend != NULL) g_error ("Unsupported GDK backend: %s", backend); else |