diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2013-02-22 16:44:13 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-03-22 22:25:32 -0400 |
| commit | 09d0d32af0e2b206e21afc6f081bbc8235e58009 (patch) | |
| tree | b50471942d2c28ba9f9d73add6e5879d3b080255 /gdk/gdkdisplaymanager.c | |
| parent | 3a9de35a6cefddc09aaf000e523f3435a955a5e7 (diff) | |
| download | gtk+-09d0d32af0e2b206e21afc6f081bbc8235e58009.tar.gz | |
wayland: implement GInitable and check the connection to the display server
Add GInitable implementation and fail the initialisation if it is not
possible to connect to the display server.
https://bugzilla.gnome.org/show_bug.cgi?id=694465
Diffstat (limited to 'gdk/gdkdisplaymanager.c')
| -rw-r--r-- | gdk/gdkdisplaymanager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index f4706112e8..70b6a62a9d 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -259,14 +259,14 @@ gdk_display_manager_get (void) if (!manager && (backend == NULL || strcmp (backend, "win32") == 0)) manager = g_initable_new (gdk_win32_display_manager_get_type (), NULL, NULL, NULL); #endif -#ifdef GDK_WINDOWING_X11 - if (!manager && (backend == NULL || strcmp (backend, "x11") == 0)) - manager = g_initable_new (gdk_x11_display_manager_get_type (), NULL, NULL, NULL); -#endif #ifdef GDK_WINDOWING_WAYLAND if (!manager && (backend == NULL || strcmp (backend, "wayland") == 0)) manager = g_initable_new (gdk_wayland_display_manager_get_type (), NULL, NULL, NULL); #endif +#ifdef GDK_WINDOWING_X11 + if (!manager && (backend == NULL || strcmp (backend, "x11") == 0)) + manager = g_initable_new (gdk_x11_display_manager_get_type (), NULL, NULL, NULL); +#endif #ifdef GDK_WINDOWING_BROADWAY if (!manager && (backend == NULL || strcmp (backend, "broadway") == 0)) manager = g_initable_new (gdk_broadway_display_manager_get_type (), NULL, NULL, NULL); |