[gtk+] gdk: remove the core_pointer field from GdkDisplay
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: remove the core_pointer field from GdkDisplay
- Date: Mon, 29 Feb 2016 13:17:07 +0000 (UTC)
commit 38ad57948c5960cdcb8e2487153a2dfb94a5dfab
Author: Paolo Borelli <pborelli gnome org>
Date: Sun Feb 28 15:15:29 2016 +0100
gdk: remove the core_pointer field from GdkDisplay
It is not used anymore, so no need to set it
https://bugzilla.gnome.org/show_bug.cgi?id=762820
gdk/broadway/gdkdisplay-broadway.c | 3 +--
gdk/gdkdisplayprivate.h | 1 -
gdk/mir/gdkmirdevicemanager.c | 1 -
gdk/quartz/gdkdisplay-quartz.c | 3 +--
gdk/wayland/gdkdisplay-wayland.c | 4 ++--
gdk/win32/gdkdisplay-win32.c | 6 ++----
gdk/x11/gdkdisplay-x11.c | 3 +--
7 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index dd605d8..c5f6428 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -97,9 +97,8 @@ gdk_broadway_display_init_input (GdkDisplay *display)
g_list_free (list);
/* Add the core pointer to the devices list */
- display->core_pointer = GDK_BROADWAY_DEVICE_MANAGER (device_manager)->core_pointer;
broadway_display->input_devices = g_list_prepend (broadway_display->input_devices,
- g_object_ref (display->core_pointer));
+ g_object_ref (GDK_BROADWAY_DEVICE_MANAGER
(device_manager)->core_pointer));
G_GNUC_END_IGNORE_DEPRECATIONS;
}
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 1dbf9f6..6bdae09 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -102,7 +102,6 @@ struct _GdkDisplay
* is part of a double-click or triple-click
*/
GHashTable *multiple_click_info;
- GdkDevice *core_pointer; /* Core pointer device */
guint event_pause_count; /* How many times events are blocked */
diff --git a/gdk/mir/gdkmirdevicemanager.c b/gdk/mir/gdkmirdevicemanager.c
index a4c38a9..8628e04 100644
--- a/gdk/mir/gdkmirdevicemanager.c
+++ b/gdk/mir/gdkmirdevicemanager.c
@@ -107,7 +107,6 @@ gdk_mir_device_manager_constructed (GObject *object)
_gdk_device_set_associated_device (device_manager->pointer, device_manager->keyboard);
display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager));
- display->core_pointer = device_manager->pointer;
seat = gdk_seat_default_new_for_master_pair (device_manager->pointer, device_manager->keyboard);
gdk_display_add_seat (display, seat);
diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 62e1d65..15b3f39 100644
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -87,9 +87,8 @@ gdk_quartz_display_init_input (GdkDisplay *display)
g_list_free (list);
/* Add the core pointer to the devices list */
- display->core_pointer = GDK_QUARTZ_DEVICE_MANAGER_CORE (device_manager)->core_pointer;
display_quartz->input_devices = g_list_prepend (display_quartz->input_devices,
- g_object_ref (display->core_pointer));
+ g_object_ref (GDK_QUARTZ_DEVICE_MANAGER_CORE
(device_manager)->core_pointer));
}
GdkDisplay *
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 4d0a227..50043dc 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -111,10 +111,10 @@ gdk_input_init (GdkDisplay *display)
GdkWaylandDisplay *display_wayland;
display_wayland = GDK_WAYLAND_DISPLAY (display);
- display->core_pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
/* Add the core pointer to the devices list */
- display_wayland->input_devices = g_list_prepend (display_wayland->input_devices, display->core_pointer);
+ display_wayland->input_devices = g_list_prepend (display_wayland->input_devices,
+ gdk_seat_get_pointer (gdk_display_get_default_seat
(display)));
}
static void
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index b4e8ff3..1faf19f 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -50,10 +50,8 @@ _gdk_input_init (GdkDisplay *display)
NULL);
display->device_manager = GDK_DEVICE_MANAGER (device_manager);
- display->core_pointer = device_manager->core_pointer;
-
- devices = g_list_append (NULL, display->core_pointer);
- devices = g_list_concat (devices, g_list_copy (device_manager->wintab_devices));
+ devices = g_list_copy (device_manager->wintab_devices);
+ devices = g_list_prepend (devices, device_manager->core_pointer);
GDK_WIN32_DISPLAY (display)->input_devices = devices;
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 64095b2..484ce40 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1369,9 +1369,8 @@ gdk_x11_display_init_input (GdkDisplay *display)
g_list_free (list);
- display->core_pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
display_x11->input_devices = g_list_prepend (display_x11->input_devices,
- g_object_ref (display->core_pointer));
+ g_object_ref (gdk_seat_get_pointer
(gdk_display_get_default_seat (display))));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]