From 57691eacc5a10bf9cf62797f1452ffa16f04051c Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Fri, 8 Jan 2021 13:10:56 +0100 Subject: seatdefault: rename dispose method --- gdk/gdkseatdefault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c index 2226d36da1..0a05046cc3 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); @@ -307,7 +307,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; -- cgit v1.2.1 From a720d8bc79bf2ec67108506204a7995a78306fdb Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Fri, 8 Jan 2021 13:11:56 +0100 Subject: seatdefault: use g_clear_pointer to unref the tools --- gdk/gdkseatdefault.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c index 0a05046cc3..7e2c83ea93 100644 --- a/gdk/gdkseatdefault.c +++ b/gdk/gdkseatdefault.c @@ -79,11 +79,7 @@ gdk_seat_default_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); -- cgit v1.2.1