diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-16 11:04:18 +0100 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-16 11:04:18 +0100 |
commit | aef36c92e606fef5789fda5b680e861c62939a90 (patch) | |
tree | 810537aca44f300000ecbabe20b4d3ae18076249 /src/seat.c | |
parent | 5b1596558dd7e01b892479fa32b46757b7566ee2 (diff) | |
download | lightdm-git-aef36c92e606fef5789fda5b680e861c62939a90.tar.gz |
Tidy up finalize methods
Diffstat (limited to 'src/seat.c')
-rw-r--r-- | src/seat.c | 16 |
1 files changed, 5 insertions, 11 deletions
@@ -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); } |