summaryrefslogtreecommitdiff
path: root/gdk/gdkseatdefault.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/gdkseatdefault.c')
-rw-r--r--gdk/gdkseatdefault.c10
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;