Tidy up finalize methods

[sojka/lightdm.git] / src / seat.c

diff --git a/src/seat.c b/src/seat.c
index 13624ccb6fe5c78e24154d343ee1e5ca0dd942f0..857aa1b045302019f1f56eb327d98641f14c9037 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -1899,11 +1899,9 @@ seat_init (Seat *seat)
 static void
 seat_finalize (GObject *object)
 {
-    Seat *self;
+    Seat *self = SEAT (object);
     GList *link;
 
-    self = SEAT (object);
-
     g_free (self->priv->name);
     g_hash_table_unref (self->priv->properties);
     for (link = self->priv->display_servers; link; link = link->next)
@@ -1918,14 +1916,10 @@ seat_finalize (GObject *object)
         g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
     }
     g_list_free_full (self->priv->sessions, g_object_unref);
-    if (self->priv->active_session)
-        g_object_unref (self->priv->active_session);
-    if (self->priv->next_session)
-        g_object_unref (self->priv->next_session);
-    if (self->priv->session_to_activate)
-        g_object_unref (self->priv->session_to_activate);
-    if (self->priv->replacement_greeter)
-        g_object_unref (self->priv->replacement_greeter);
+    g_clear_object (&self->priv->active_session);
+    g_clear_object (&self->priv->next_session);
+    g_clear_object (&self->priv->session_to_activate);
+    g_clear_object (&self->priv->replacement_greeter);
 
     G_OBJECT_CLASS (seat_parent_class)->finalize (object);
 }