Merge branch 'gtk-3-0' into broadway

[~andy/gtk] / gdk / gdkdisplaymanager.c

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 1c442045f9e04ba3eb06419ec1e41c2e723c221b..11b899ccba7e335c737ff5fa7e5409597211b76b 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -44,6 +44,10 @@
 #include "quartz/gdkquartzdisplaymanager.h"
 #endif
 
+#ifdef GDK_WINDOWING_BROADWAY
+#include "broadway/gdkbroadwaydisplaymanager.h"
+#endif
+
 #ifdef GDK_WINDOWING_WIN32
 #include "win32/gdkwin32.h"
 #endif
@@ -239,6 +243,11 @@ gdk_display_manager_get (void)
       if (backend == NULL || strcmp (backend, "x11") == 0)
         manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
       else
+#endif
+#ifdef GDK_WINDOWING_BROADWAY
+      if (backend == NULL || strcmp (backend, "broadway") == 0)
+        manager = g_object_new (gdk_broadway_display_manager_get_type (), NULL);
+      else
 #endif
       if (backend != NULL)
         g_error ("Unsupported GDK backend: %s", backend);