[gtk+] wayland: Don't add/remove displays manually
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: Don't add/remove displays manually
- Date: Wed, 1 May 2013 21:37:38 +0000 (UTC)
commit a30b84f5223e1818411c489c46f71509a0391be8
Author: Benjamin Otte <otte redhat com>
Date: Wed May 1 18:12:38 2013 +0200
wayland: Don't add/remove displays manually
This code is handled by GdkDisplay itself these days.
gdk/wayland/gdkdisplay-wayland.c | 5 -----
gdk/wayland/gdkdisplaymanager-wayland.c | 28 ----------------------------
gdk/wayland/gdkprivate-wayland.h | 5 -----
3 files changed, 0 insertions(+), 38 deletions(-)
---
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 1f1f413..3a80d0a 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -260,8 +260,6 @@ gdk_wayland_display_dispose (GObject *object)
{
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (object);
- _gdk_wayland_display_manager_remove_display (gdk_display_manager_get (),
- GDK_DISPLAY (display_wayland));
g_list_foreach (display_wayland->input_devices,
(GFunc) g_object_run_dispose, NULL);
@@ -613,9 +611,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass * class)
static void
gdk_wayland_display_init (GdkWaylandDisplay *display)
{
- _gdk_wayland_display_manager_add_display (gdk_display_manager_get (),
- GDK_DISPLAY (display));
-
display->xkb_context = xkb_context_new (0);
}
diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c
index 32b2018..139f4ed 100644
--- a/gdk/wayland/gdkdisplaymanager-wayland.c
+++ b/gdk/wayland/gdkdisplaymanager-wayland.c
@@ -101,31 +101,3 @@ gdk_wayland_display_manager_init (GdkWaylandDisplayManager *manager)
{
}
-void
-_gdk_wayland_display_manager_add_display (GdkDisplayManager *manager,
- GdkDisplay *display)
-{
- GdkWaylandDisplayManager *manager_wayland = GDK_WAYLAND_DISPLAY_MANAGER (manager);
-
- if (manager_wayland->displays == NULL)
- gdk_display_manager_set_default_display (manager, display);
-
- manager_wayland->displays = g_slist_prepend (manager_wayland->displays, display);
-}
-
-void
-_gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager,
- GdkDisplay *display)
-{
- GdkWaylandDisplayManager *manager_wayland = GDK_WAYLAND_DISPLAY_MANAGER (manager);
-
- manager_wayland->displays = g_slist_remove (manager_wayland->displays, display);
-
- if (gdk_display_manager_get_default_display (manager) == display)
- {
- if (manager_wayland->displays)
- gdk_display_manager_set_default_display (manager, manager_wayland->displays->data);
- else
- gdk_display_manager_set_default_display (manager, NULL);
- }
-}
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index 7aefedb..43d1c3d 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -167,11 +167,6 @@ void _gdk_wayland_screen_remove_output (GdkScreen *screen,
int _gdk_wayland_screen_get_output_refresh_rate (GdkScreen *screen,
struct wl_output *output);
-void _gdk_wayland_display_manager_add_display (GdkDisplayManager *manager,
- GdkDisplay *display);
-void _gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager,
- GdkDisplay *display);
-
void _gdk_wayland_window_set_device_grabbed (GdkWindow *window,
GdkDevice *device,
struct wl_seat *seat,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]