From 98b1075764bd998f4ebae1db2e2bb3fc7fa1bbf1 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 28 Apr 2017 15:07:04 +0100 Subject: [PATCH] gdk: Remove GdkX11DisplayManager from the build We don't instantiate it, and we don't use it any more. --- docs/reference/gdk/gdk4-sections.txt | 6 --- gdk/Makefile.am | 2 - 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 - 10 files changed, 124 deletions(-) delete mode 100644 gdk/x11/gdkdisplaymanager-x11.c delete mode 100644 gdk/x11/gdkx11displaymanager.h diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 0eec4fe112..25891c8d3b 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -1082,12 +1082,6 @@ GDK_X11_DISPLAY_CLASS GDK_IS_X11_DISPLAY GDK_IS_X11_DISPLAY_CLASS GDK_X11_DISPLAY_GET_CLASS -GDK_TYPE_X11_DISPLAY_MANAGER -GDK_X11_DISPLAY_MANAGER -GDK_X11_DISPLAY_MANAGER_CLASS -GDK_IS_X11_DISPLAY_MANAGER -GDK_IS_X11_DISPLAY_MANAGER_CLASS -GDK_X11_DISPLAY_MANAGER_GET_CLASS GDK_TYPE_X11_DRAG_CONTEXT GDK_X11_DRAG_CONTEXT GDK_X11_DRAG_CONTEXT_CLASS diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 963b523fca..71c92e321b 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -252,7 +252,6 @@ x11_introspection_files = \ x11/gdkdevicemanager-xi2.c \ x11/gdkdevice-xi2.c \ x11/gdkdisplay-x11.c \ - x11/gdkdisplaymanager-x11.c \ x11/gdkdnd-x11.c \ x11/gdkeventsource.c \ x11/gdkeventtranslator.c \ @@ -278,7 +277,6 @@ x11_introspection_files = \ x11/gdkx11devicemanager-core.h \ x11/gdkx11devicemanager-xi2.h \ x11/gdkx11display.h \ - x11/gdkx11displaymanager.h \ x11/gdkx11dnd.h \ x11/gdkx11keys.h \ x11/gdkx11property.h \ diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index f318ef3cf9..21ff9fef23 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/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c deleted file mode 100644 index 7bc116d66c..0000000000 --- a/gdk/x11/gdkdisplaymanager-x11.c +++ /dev/null @@ -1,61 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * gdkdisplaymanager-x11.c - * - * Copyright 2010 Red Hat, Inc. - * - * Author: Matthias clasen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library. If not, see . - */ - -#include "config.h" - -#include "gdkx11displaymanager.h" -#include "gdkdisplaymanagerprivate.h" -#include "gdkdisplay-x11.h" -#include "gdkprivate-x11.h" - -#include "gdkinternals.h" - -struct _GdkX11DisplayManager -{ - GdkDisplayManager parent; -}; - -struct _GdkX11DisplayManagerClass -{ - GdkDisplayManagerClass parent_class; -}; - -G_DEFINE_TYPE (GdkX11DisplayManager, gdk_x11_display_manager, GDK_TYPE_DISPLAY_MANAGER) - -static void -gdk_x11_display_manager_init (GdkX11DisplayManager *manager) -{ -} - -static void -gdk_x11_display_manager_finalize (GObject *object) -{ - g_error ("A GdkX11DisplayManager object was finalized. This should not happen"); - G_OBJECT_CLASS (gdk_x11_display_manager_parent_class)->finalize (object); -} - -static void -gdk_x11_display_manager_class_init (GdkX11DisplayManagerClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - - object_class->finalize = gdk_x11_display_manager_finalize; -} diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h index edb0ea7dbf..fcc27df08b 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 1f64bccb6d..c6f5ec8075 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/gdk/x11/gdkx11displaymanager.h b/gdk/x11/gdkx11displaymanager.h deleted file mode 100644 index 3e12c9df92..0000000000 --- a/gdk/x11/gdkx11displaymanager.h +++ /dev/null @@ -1,48 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2010 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GDK_X11_DISPLAY_MANAGER_H__ -#define __GDK_X11_DISPLAY_MANAGER_H__ - -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#ifdef GDK_COMPILATION -typedef struct _GdkX11DisplayManager GdkX11DisplayManager; -#else -typedef GdkDisplayManager GdkX11DisplayManager; -#endif -typedef struct _GdkX11DisplayManagerClass GdkX11DisplayManagerClass; - -#define GDK_TYPE_X11_DISPLAY_MANAGER (gdk_x11_display_manager_get_type()) -#define GDK_X11_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_DISPLAY_MANAGER, GdkX11DisplayManager)) -#define GDK_X11_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_DISPLAY_MANAGER, GdkX11DisplayManagerClass)) -#define GDK_IS_X11_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_DISPLAY_MANAGER)) -#define GDK_IS_X11_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY_MANAGER)) -#define GDK_X11_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY_MANAGER, GdkX11DisplayManagerClass)) - -GDK_AVAILABLE_IN_ALL -GType gdk_x11_display_manager_get_type (void); - -G_END_DECLS - -#endif /* __GDK_X11_DISPLAY_MANAGER_H__ */ diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c index 23b7b596c4..e54b499d70 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 3f369136a6..04b6739de6 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 0b3a5198dc..4b8a33dc82 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() */