summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-10-16 11:04:18 +0100
committerRobert Ancell <robert.ancell@canonical.com>2015-10-16 11:04:18 +0100
commitaef36c92e606fef5789fda5b680e861c62939a90 (patch)
tree810537aca44f300000ecbabe20b4d3ae18076249 /common
parent5b1596558dd7e01b892479fa32b46757b7566ee2 (diff)
downloadlightdm-aef36c92e606fef5789fda5b680e861c62939a90.tar.gz
Tidy up finalize methods
Diffstat (limited to 'common')
-rw-r--r--common/configuration.c4
-rw-r--r--common/user-list.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/common/configuration.c b/common/configuration.c
index 895085e3..dc7831a8 100644
--- a/common/configuration.c
+++ b/common/configuration.c
@@ -331,9 +331,7 @@ config_init (Configuration *config)
static void
config_finalize (GObject *object)
{
- Configuration *self;
-
- self = CONFIGURATION (object);
+ Configuration *self = CONFIGURATION (object);
g_free (self->priv->dir);
g_key_file_free (self->priv->key_file);
diff --git a/common/user-list.c b/common/user-list.c
index 792c6d3a..2598bd49 100644
--- a/common/user-list.c
+++ b/common/user-list.c
@@ -1059,8 +1059,7 @@ common_user_list_finalize (GObject *object)
if (priv->session_removed_signal)
g_dbus_connection_signal_unsubscribe (priv->bus, priv->session_removed_signal);
g_object_unref (priv->bus);
- if (priv->passwd_monitor)
- g_object_unref (priv->passwd_monitor);
+ g_clear_object (&priv->passwd_monitor);
G_OBJECT_CLASS (common_user_list_parent_class)->finalize (object);
}