[gtk+/wip/matthiasc/kill-device-manager: 16/26] Drop the get_client_pointer vfunc



commit f85c0d758af36bdd88a8b16f0d99e415de3dc8b9
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 24 21:26:20 2017 -0500

    Drop the get_client_pointer vfunc
    
    There is no api using this anymore.

 gdk/quartz/gdkdevicemanager-core-quartz.c |   10 ----------
 gdk/wayland/gdkdevice-wayland.c           |   18 ------------------
 gdk/win32/gdkdevicemanager-win32.c        |   10 ----------
 gdk/x11/gdkdevicemanager-core-x11.c       |   13 -------------
 gdk/x11/gdkdevicemanager-xi2.c            |    3 ---
 5 files changed, 0 insertions(+), 54 deletions(-)
---
diff --git a/gdk/quartz/gdkdevicemanager-core-quartz.c b/gdk/quartz/gdkdevicemanager-core-quartz.c
index 7620735..bded104 100644
--- a/gdk/quartz/gdkdevicemanager-core-quartz.c
+++ b/gdk/quartz/gdkdevicemanager-core-quartz.c
@@ -47,7 +47,6 @@ gdk_quartz_device_manager_core_class_init (GdkQuartzDeviceManagerCoreClass *klas
 
   object_class->finalize = gdk_quartz_device_manager_core_finalize;
   object_class->constructed = gdk_quartz_device_manager_core_constructed;
-  device_manager_class->get_client_pointer = gdk_quartz_device_manager_core_get_client_pointer;
 }
 
 static GdkDevice *
@@ -118,12 +117,3 @@ gdk_quartz_device_manager_core_constructed (GObject *object)
   gdk_display_add_seat (display, seat);
   g_object_unref (seat);
 }
-
-static GdkDevice *
-gdk_quartz_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkQuartzDeviceManagerCore *quartz_device_manager_core;
-
-  quartz_device_manager_core = (GdkQuartzDeviceManagerCore *) device_manager;
-  return quartz_device_manager_core->core_pointer;
-}
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index cd4e4a7..5ee91a3 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -5001,30 +5001,12 @@ gdk_wayland_device_manager_finalize (GObject *object)
   G_OBJECT_CLASS (gdk_wayland_device_manager_parent_class)->finalize (object);
 }
 
-static GdkDevice *
-gdk_wayland_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkWaylandDeviceManager *wayland_device_manager;
-  GdkWaylandSeat *seat;
-  GdkDevice *device;
-
-  wayland_device_manager = GDK_WAYLAND_DEVICE_MANAGER (device_manager);
-
-  /* Find the master pointer of the first GdkWaylandSeat we find */
-  device = wayland_device_manager->devices->data;
-  seat = GDK_WAYLAND_SEAT (gdk_device_get_seat (device));
-
-  return seat->master_pointer;
-}
-
 static void
 gdk_wayland_device_manager_class_init (GdkWaylandDeviceManagerClass *klass)
 {
-  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = gdk_wayland_device_manager_finalize;
-  device_manager_class->get_client_pointer = gdk_wayland_device_manager_get_client_pointer;
 }
 
 static void
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index 9260f65..1616d9a 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -754,15 +754,6 @@ gdk_device_manager_win32_constructed (GObject *object)
                     NULL);
 }
 
-static GdkDevice *
-gdk_device_manager_win32_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkDeviceManagerWin32 *device_manager_win32;
-
-  device_manager_win32 = (GdkDeviceManagerWin32 *) device_manager;
-  return device_manager_win32->core_pointer;
-}
-
 static void
 gdk_device_manager_win32_class_init (GdkDeviceManagerWin32Class *klass)
 {
@@ -771,7 +762,6 @@ gdk_device_manager_win32_class_init (GdkDeviceManagerWin32Class *klass)
 
   object_class->finalize = gdk_device_manager_win32_finalize;
   object_class->constructed = gdk_device_manager_win32_constructed;
-  device_manager_class->get_client_pointer = gdk_device_manager_win32_get_client_pointer;
 }
 
 void
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
index 5a40dab..fc26db2 100644
--- a/gdk/x11/gdkdevicemanager-core-x11.c
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
@@ -35,8 +35,6 @@
 static void    gdk_x11_device_manager_core_finalize    (GObject *object);
 static void    gdk_x11_device_manager_core_constructed (GObject *object);
 
-static GdkDevice * gdk_x11_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager);
-
 static void     gdk_x11_device_manager_event_translator_init (GdkEventTranslatorIface *iface);
 
 static gboolean gdk_x11_device_manager_core_translate_event  (GdkEventTranslator *translator,
@@ -52,12 +50,10 @@ G_DEFINE_TYPE_WITH_CODE (GdkX11DeviceManagerCore, gdk_x11_device_manager_core, G
 static void
 gdk_x11_device_manager_core_class_init (GdkX11DeviceManagerCoreClass *klass)
 {
-  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = gdk_x11_device_manager_core_finalize;
   object_class->constructed = gdk_x11_device_manager_core_constructed;
-  device_manager_class->get_client_pointer = gdk_x11_device_manager_core_get_client_pointer;
 }
 
 static void
@@ -680,15 +676,6 @@ gdk_x11_device_manager_core_translate_event (GdkEventTranslator *translator,
   return return_val;
 }
 
-static GdkDevice *
-gdk_x11_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
-{
-  GdkX11DeviceManagerCore *device_manager_core;
-
-  device_manager_core = (GdkX11DeviceManagerCore *) device_manager;
-  return device_manager_core->core_pointer;
-}
-
 void
 _gdk_x11_event_translate_keyboard_string (GdkEventKey *event)
 {
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 688780b..2819059 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -96,7 +96,6 @@ enum {
 static void
 gdk_x11_device_manager_xi2_class_init (GdkX11DeviceManagerXI2Class *klass)
 {
-  GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->constructed = gdk_x11_device_manager_xi2_constructed;
@@ -104,8 +103,6 @@ gdk_x11_device_manager_xi2_class_init (GdkX11DeviceManagerXI2Class *klass)
   object_class->set_property = gdk_x11_device_manager_xi2_set_property;
   object_class->get_property = gdk_x11_device_manager_xi2_get_property;
 
-  device_manager_class->get_client_pointer = gdk_x11_device_manager_xi2_get_client_pointer;
-
   g_object_class_install_property (object_class,
                                    PROP_OPCODE,
                                    g_param_spec_int ("opcode",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]