summaryrefslogtreecommitdiff
path: root/gdk/quartz
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2020-06-18 19:22:20 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2020-06-18 19:22:20 +0100
commit1c856a208fdc9b435be60973e9c465f19b532863 (patch)
treeac979f50a9f429a10928e0066ae1be312af8c23b /gdk/quartz
parentc7916c8e480f08c03f7ce9f77cbba87f2c9d949b (diff)
downloadgtk+-1c856a208fdc9b435be60973e9c465f19b532863.tar.gz
Rename master and slave device
We already use the "logical/virtual" and "physical" names in the documentation, there's no reason to use loaded terms just because X11 uses them.
Diffstat (limited to 'gdk/quartz')
-rw-r--r--gdk/quartz/gdkdevicemanager-core-quartz.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/quartz/gdkdevicemanager-core-quartz.c b/gdk/quartz/gdkdevicemanager-core-quartz.c
index de12acbc09..9e4620c693 100644
--- a/gdk/quartz/gdkdevicemanager-core-quartz.c
+++ b/gdk/quartz/gdkdevicemanager-core-quartz.c
@@ -54,7 +54,7 @@ create_core_pointer (GdkQuartzDeviceManagerCore *device_manager,
{
return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE,
"name", "Core Pointer",
- "type", GDK_DEVICE_TYPE_MASTER,
+ "type", GDK_DEVICE_TYPE_LOGICAL,
"input-source", GDK_SOURCE_MOUSE,
"input-mode", GDK_MODE_SCREEN,
"has-cursor", TRUE,
@@ -69,7 +69,7 @@ create_core_keyboard (GdkQuartzDeviceManagerCore *device_manager,
{
return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE,
"name", "Core Keyboard",
- "type", GDK_DEVICE_TYPE_MASTER,
+ "type", GDK_DEVICE_TYPE_LOGICAL,
"input-source", GDK_SOURCE_KEYBOARD,
"input-mode", GDK_MODE_SCREEN,
"has-cursor", FALSE,
@@ -112,8 +112,8 @@ gdk_quartz_device_manager_core_constructed (GObject *object)
_gdk_device_set_associated_device (device_manager->core_pointer, device_manager->core_keyboard);
_gdk_device_set_associated_device (device_manager->core_keyboard, device_manager->core_pointer);
- seat = gdk_seat_default_new_for_master_pair (device_manager->core_pointer,
- device_manager->core_keyboard);
+ seat = gdk_seat_default_new_for_logical_pair (device_manager->core_pointer,
+ device_manager->core_keyboard);
gdk_display_add_seat (display, seat);
g_object_unref (seat);
}