diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-09 01:04:22 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-09 01:04:22 +0000 |
| commit | d5ef906cff9b0939079f5e32b64ec1427cffcfac (patch) | |
| tree | 79d219c24b26d49c0ea1370c8ddbf26d2d64cab6 | |
| parent | 526e24f5b12e4b2cce7404c7911ea49f3be217ea (diff) | |
| parent | a720d8bc79bf2ec67108506204a7995a78306fdb (diff) | |
| download | gtk+-d5ef906cff9b0939079f5e32b64ec1427cffcfac.tar.gz | |
Merge branch 'nacho/seatdefault' into 'master'
Clean ups in seat default
See merge request GNOME/gtk!3057
| -rw-r--r-- | gdk/gdkseatdefault.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c index 2226d36da1..7e2c83ea93 100644 --- a/gdk/gdkseatdefault.c +++ b/gdk/gdkseatdefault.c @@ -49,7 +49,7 @@ struct _GdkSeatDefaultPrivate G_DEFINE_TYPE_WITH_PRIVATE (GdkSeatDefault, gdk_seat_default, GDK_TYPE_SEAT) static void -gdk_seat_dispose (GObject *object) +gdk_seat_default_dispose (GObject *object) { GdkSeatDefault *seat = GDK_SEAT_DEFAULT (object); GdkSeatDefaultPrivate *priv = gdk_seat_default_get_instance_private (seat); @@ -79,11 +79,7 @@ gdk_seat_dispose (GObject *object) g_object_unref (l->data); } - if (priv->tools) - { - g_ptr_array_unref (priv->tools); - priv->tools = NULL; - } + g_clear_pointer (&priv->tools, g_ptr_array_unref); g_list_free (priv->physical_pointers); g_list_free (priv->physical_keyboards); @@ -307,7 +303,7 @@ gdk_seat_default_class_init (GdkSeatDefaultClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GdkSeatClass *seat_class = GDK_SEAT_CLASS (klass); - object_class->dispose = gdk_seat_dispose; + object_class->dispose = gdk_seat_default_dispose; seat_class->get_capabilities = gdk_seat_default_get_capabilities; |