diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-12 09:52:44 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-12 09:52:44 -0400 |
| commit | c7514e8f0d19a833257497caff413bb4dfae6eb4 (patch) | |
| tree | 7dc4bbd5b5a162b5b0b0277c68f7b7e3c6dd457b /gdk/gdkdisplaymanager.c | |
| parent | 85c1c22d04d369529ec4c3b6f608270f4f394cb5 (diff) | |
| parent | fcd58b0ffd0935567437b89bb077f60195336764 (diff) | |
| download | gtk+-c7514e8f0d19a833257497caff413bb4dfae6eb4.tar.gz | |
Merge branch 'gdk-backend-wayland'
Conflicts:
Makefile.am
configure.ac
gdk/Makefile.am
gtk/gtksettings.c
gtk/gtkwindow.c
Diffstat (limited to 'gdk/gdkdisplaymanager.c')
| -rw-r--r-- | gdk/gdkdisplaymanager.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 11b899ccba..c21ea02c21 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -52,6 +52,10 @@ #include "win32/gdkwin32.h" #endif +#ifdef GDK_WINDOWING_WAYLAND +#include "wayland/gdkwayland.h" +#endif + /** * SECTION:gdkdisplaymanager * @Short_description: Maintains a list of all open GdkDisplays @@ -239,6 +243,11 @@ gdk_display_manager_get (void) manager = g_object_new (gdk_win32_display_manager_get_type (), NULL); else #endif +#ifdef GDK_WINDOWING_WAYLAND + if (backend == NULL || strcmp (backend, "wayland") == 0) + manager = g_object_new (gdk_wayland_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); |