Replace references to sealed GdkDevice private variables with accessor calls in quartz.

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index c6512fc4db9977708665906471d0d6ad276f1bbe..44f10cbbf407fb2409b83823e2a773e37e6753e9 100644 (file)
--- 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 c431fc47afaf913fcf8aae1ae742aaebbe8bf670..31d1bd2c1854048b286ff8b12e430b0d10cdfc75 100644 (file)
--- 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);
        }
     }