[gtk+/wip/meson: 8/135] gdk: Remove GdkX11DisplayManager from the build

[Emmanuele Bassi <ebassi src gnome org>]

commit ab407a760c5fcb8612169e2711f4592473dc86dc
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Apr 28 15:07:04 2017 +0100

    gdk: Remove GdkX11DisplayManager from the build
    
    We don't instantiate it, and we don't use it any more.

 gdk/x11/Makefile.am              |    2 -
 gdk/x11/gdkdisplaymanager-x11.c  |   61 --------------------------------------
 gdk/x11/gdkx-autocleanups.h      |    1 -
 gdk/x11/gdkx.h                   |    1 -
 gdk/x11/gdkx11displaymanager.h   |   48 -----------------------------
 testsuite/gtk/defaultvalue.c     |    1 -
 testsuite/gtk/notify.c           |    1 -
 testsuite/gtk/objects-finalize.c |    1 -
 8 files changed, 0 insertions(+), 116 deletions(-)
---
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index f318ef3..21ff9fe 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -31,7 +31,6 @@ libgdk_x11_la_SOURCES =       \
        gdkdevicemanager-x11.c  \
        gdkdevicemanager-xi2.c  \
        gdkdevicemanagerprivate-core.h \
-       gdkdisplaymanager-x11.c \
        gdkdisplay-x11.c        \
        gdkdisplay-x11.h        \
        gdkdnd-x11.c            \
@@ -76,7 +75,6 @@ libgdkx11include_HEADERS =    \
        gdkx11devicemanager-core.h \
        gdkx11devicemanager-xi2.h \
        gdkx11display.h         \
-       gdkx11displaymanager.h  \
        gdkx11dnd.h             \
        gdkx11glcontext.h       \
        gdkx11keys.h            \
diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
index edb0ea7..fcc27df 100644
--- a/gdk/x11/gdkx-autocleanups.h
+++ b/gdk/x11/gdkx-autocleanups.h
@@ -28,7 +28,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceManagerCore, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceManagerXI2, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceXI2, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Display, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DisplayManager, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DragContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11GLContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 1f64bcc..c6f5ec8 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -41,7 +41,6 @@
 #include <gdk/x11/gdkx11devicemanager-core.h>
 #include <gdk/x11/gdkx11devicemanager-xi2.h>
 #include <gdk/x11/gdkx11display.h>
-#include <gdk/x11/gdkx11displaymanager.h>
 #include <gdk/x11/gdkx11dnd.h>
 #include <gdk/x11/gdkx11glcontext.h>
 #include <gdk/x11/gdkx11keys.h>
diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index 23b7b59..e54b499 100644
--- a/testsuite/gtk/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
@@ -85,7 +85,6 @@ test_type (gconstpointer data)
       g_str_equal (g_type_name (type), "GdkX11DeviceManagerXI2") ||
       g_str_equal (g_type_name (type), "GdkX11DeviceManagerCore") ||
       g_str_equal (g_type_name (type), "GdkX11Display") ||
-      g_str_equal (g_type_name (type), "GdkX11DisplayManager") ||
       g_str_equal (g_type_name (type), "GdkX11Screen") ||
       g_str_equal (g_type_name (type), "GdkX11GLContext"))
     return;
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 3f36913..04b6739 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -376,7 +376,6 @@ test_type (gconstpointer data)
       g_str_equal (g_type_name (type), "GdkX11DeviceManagerXI2") ||
       g_str_equal (g_type_name (type), "GdkX11DeviceManagerCore") ||
       g_str_equal (g_type_name (type), "GdkX11Display") ||
-      g_str_equal (g_type_name (type), "GdkX11DisplayManager") ||
       g_str_equal (g_type_name (type), "GdkX11Screen") ||
       g_str_equal (g_type_name (type), "GdkX11GLContext"))
     return;
diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index 0b3a519..4b8a33d 100644
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -114,7 +114,6 @@ main (int argc, char **argv)
          all_types[i] != GDK_TYPE_X11_DISPLAY &&
          all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE &&
          all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 &&
-         all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER &&
          all_types[i] != GDK_TYPE_X11_GL_CONTEXT &&
 #endif
          /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */