From c0aae6644aedb16d71c9a480c5e89b0c7b58b7f7 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 23 Nov 2010 16:52:24 -0800 Subject: [PATCH] Replace references to sealed GdkDevice private variables with accessor calls in quartz. --- gdk/quartz/gdkevents-quartz.c | 2 +- gdk/quartz/gdkinput.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index c6512fc4d..44f10cbbf 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -571,7 +571,7 @@ find_toplevel_for_keyboard_event (NSEvent *nsevent) GdkDeviceGrabInfo *grab; GdkDevice *device = l->data; - if (device->source != GDK_SOURCE_KEYBOARD) + if (gdk_device_get_source(device) != GDK_SOURCE_KEYBOARD) continue; grab = _gdk_display_get_last_device_grab (display, device); diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c index c431fc47a..31d1bd2c1 100644 --- a/gdk/quartz/gdkinput.c +++ b/gdk/quartz/gdkinput.c @@ -228,7 +228,7 @@ _gdk_input_init (void) { GdkDevice *device = l->data; - if (device->source == GDK_SOURCE_KEYBOARD) + if (gdk_device_get_source(device) == GDK_SOURCE_KEYBOARD) continue; _gdk_input_devices = g_list_prepend (_gdk_input_devices, l->data); @@ -245,7 +245,7 @@ _gdk_input_init (void) { GdkDevice *device = list->data; - if (device->source != GDK_SOURCE_MOUSE) + if (gdk_device_get_source(device) != GDK_SOURCE_MOUSE) continue; _gdk_display->core_pointer = device; @@ -273,11 +273,7 @@ _gdk_input_exit (void) if (gdkdev != (GdkDevicePrivate *)_gdk_core_pointer) { gdk_device_set_mode ((GdkDevice *)gdkdev, GDK_MODE_DISABLED); - - g_free (gdkdev->info.name); - g_free (gdkdev->info.axes); - g_free (gdkdev->info.keys); - g_free (gdkdev); + g_object_unref(gdkdev); } } -- 2.43.2