diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-07 21:08:46 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-07 21:08:46 +0000 |
| commit | 526e24f5b12e4b2cce7404c7911ea49f3be217ea (patch) | |
| tree | ca2e5faa3c972da46704a88e0ec017d0a6678f8c | |
| parent | 2a79152762af6cfaebdd97bcc45fe21cd97df043 (diff) | |
| parent | 3ca3d7efeff9dcdad713e8f4f8179e662b8959d0 (diff) | |
| download | gtk+-526e24f5b12e4b2cce7404c7911ea49f3be217ea.tar.gz | |
Merge branch 'wip/nacho/associated-device' into 'master'
gdkdevice: use g_set_object to set the associated device
See merge request GNOME/gtk!3049
| -rw-r--r-- | gdk/gdkdevice.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 34506fcd37..f96dbc5e65 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -611,17 +611,7 @@ _gdk_device_set_associated_device (GdkDevice *device, g_return_if_fail (GDK_IS_DEVICE (device)); g_return_if_fail (associated == NULL || GDK_IS_DEVICE (associated)); - if (device->associated == associated) - return; - - if (device->associated) - { - g_object_unref (device->associated); - device->associated = NULL; - } - - if (associated) - device->associated = g_object_ref (associated); + g_set_object (&device->associated, associated); } /* |