From 7470a280da29fd8c3f4b1fefc87de903b2594a00 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 2 May 2013 16:12:53 +0200 Subject: [PATCH] wayland: Remove displaymanager implementation This is an API break, but the wayland backend is unsupported, so we can get away with it. --- gdk/gdkdisplaymanager.c | 1 - gdk/wayland/Makefile.am | 2 - gdk/wayland/gdkdisplaymanager-wayland.c | 103 ------------------------ gdk/wayland/gdkwayland.h | 1 - gdk/wayland/gdkwaylanddisplaymanager.h | 50 ------------ 5 files changed, 157 deletions(-) delete mode 100644 gdk/wayland/gdkdisplaymanager-wayland.c delete mode 100644 gdk/wayland/gdkwaylanddisplaymanager.h diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 6a7728b08d..fc2bf54a21 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -58,7 +58,6 @@ #endif #ifdef GDK_WINDOWING_WAYLAND -#include "wayland/gdkwayland.h" #include "wayland/gdkprivate-wayland.h" #endif diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am index 4e3b83f0b4..5b66090b04 100644 --- a/gdk/wayland/Makefile.am +++ b/gdk/wayland/Makefile.am @@ -24,7 +24,6 @@ libgdk_wayland_la_SOURCES = \ gdkdevice-wayland.c \ gdkdisplay-wayland.c \ gdkdisplay-wayland.h \ - gdkdisplaymanager-wayland.c \ gdkdnd-wayland.c \ gdkeventsource.c \ gdkkeys-wayland.c \ @@ -40,7 +39,6 @@ libgdkinclude_HEADERS = \ libgdkwaylandinclude_HEADERS = \ gdkwaylanddevice.h \ gdkwaylanddisplay.h \ - gdkwaylanddisplaymanager.h \ gdkwaylandselection.h \ gdkwaylandwindow.h diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c deleted file mode 100644 index 139f4ed8e0..0000000000 --- a/gdk/wayland/gdkdisplaymanager-wayland.c +++ /dev/null @@ -1,103 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * gdkdisplaymanager-wayland.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 "gdkdisplaymanagerprivate.h" -#include "gdkdisplay-wayland.h" -#include "gdkprivate-wayland.h" -#include "gdkwayland.h" -#include "gdkinternals.h" - -struct _GdkWaylandDisplayManager -{ - GdkDisplayManager parent; - - GSList *displays; - - gboolean init_failed; -}; - -struct _GdkWaylandDisplayManagerClass -{ - GdkDisplayManagerClass parent_class; -}; - -static void g_initable_iface_init (GInitableIface *iface); - -G_DEFINE_TYPE_WITH_CODE (GdkWaylandDisplayManager, gdk_wayland_display_manager, GDK_TYPE_DISPLAY_MANAGER, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init)) - -static gboolean -gdk_wayland_display_manager_initable_init (GInitable *initable, - GCancellable *cancellable, - GError **error) -{ - struct wl_display *wl_display; - - /* Set by the compositor when launching a special client - and it gets reset - * by wl_display_connect so we must avoid calling it twice - */ - if (g_getenv ("WAYLAND_SOCKET")) - return TRUE; - - /* check that a connection to the default display is possible */ - wl_display = wl_display_connect (gdk_get_display_arg_name ()); - - if (!wl_display) - { - GDK_WAYLAND_DISPLAY_MANAGER (initable)->init_failed = TRUE; - return FALSE; - } - - wl_display_disconnect (wl_display); - - return TRUE; -} - -void -g_initable_iface_init (GInitableIface *iface) -{ - iface->init = gdk_wayland_display_manager_initable_init; -} - -static void -gdk_wayland_display_manager_finalize (GObject *object) -{ - if (GDK_WAYLAND_DISPLAY_MANAGER (object)->init_failed == FALSE) - g_error ("A GdkWaylandDisplayManager object was finalized. This should not happen"); - - G_OBJECT_CLASS (gdk_wayland_display_manager_parent_class)->finalize (object); -} - -static void -gdk_wayland_display_manager_class_init (GdkWaylandDisplayManagerClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - - object_class->finalize = gdk_wayland_display_manager_finalize; -} - -static void -gdk_wayland_display_manager_init (GdkWaylandDisplayManager *manager) -{ -} - diff --git a/gdk/wayland/gdkwayland.h b/gdk/wayland/gdkwayland.h index fa08735811..29a8cb36f2 100644 --- a/gdk/wayland/gdkwayland.h +++ b/gdk/wayland/gdkwayland.h @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/gdk/wayland/gdkwaylanddisplaymanager.h b/gdk/wayland/gdkwaylanddisplaymanager.h deleted file mode 100644 index 1910c965df..0000000000 --- a/gdk/wayland/gdkwaylanddisplaymanager.h +++ /dev/null @@ -1,50 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * 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 . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GDK_WAYLAND_DISPLAY_MANAGER_H__ -#define __GDK_WAYLAND_DISPLAY_MANAGER_H__ - -#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager; -typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass; - -#define GDK_TYPE_WAYLAND_DISPLAY_MANAGER (gdk_wayland_display_manager_get_type()) -#define GDK_WAYLAND_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManager)) -#define GDK_WAYLAND_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass)) -#define GDK_IS_WAYLAND_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER)) -#define GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER)) -#define GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass)) - -GType gdk_wayland_display_manager_get_type (void); - -G_END_DECLS - -#endif /* __GDK_WAYLAND_DISPLAY_MANAGER_H__ */