Merge lp:~mterry/lightdm/memleaks into lp:lightdm

[Michael Terry]

[Ken VanDine (ken-vandine)]

review: Approve

[Robert Ancell (robert-ancell)]

Also merged into 1.2 branch

[Robert Ancell (robert-ancell)]

Also, I wasn't sure but is there an issue if you load the dmrc twice and it has removed a field?

if (!priv->dmrc_file)
   priv->dmrc_file = g_key_file_new ();

will cause the existing file to be used, should it be:

if (priv->dmrc_file)
    g_key_file_free (priv->dmrc_file);
priv->dmrc_file = g_key_file_new ();

instead?

[Michael Terry (mterry)]

It's fine to reuse the object, as g_key_file_load_from_file() clears the existing contents before loading new ones.

=== modified file 'liblightdm-gobject/session.c'
--- liblightdm-gobject/session.c	2011-10-07 22:41:42 +0000
+++ liblightdm-gobject/session.c	2012-04-25 17:06:32 +0000
@@ -78,6 +78,7 @@
 
         if (!full_path)
         {
+            g_free (name);
             g_free (domain);
             return NULL;
         }
@@ -266,6 +267,17 @@
 }
 
 static void
+lightdm_session_finalize (GObject *object)
+{
+    LightDMSession *self = LIGHTDM_SESSION (object);
+    LightDMSessionPrivate *priv = GET_PRIVATE (self);
+
+    g_free (priv->key);
+    g_free (priv->name);
+    g_free (priv->comment);
+}
+
+static void
 lightdm_session_class_init (LightDMSessionClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -274,6 +286,7 @@
 
     object_class->set_property = lightdm_session_set_property;
     object_class->get_property = lightdm_session_get_property;
+    object_class->finalize = lightdm_session_finalize;
 
     g_object_class_install_property (object_class,
                                      PROP_KEY,

=== modified file 'liblightdm-gobject/user.c'
--- liblightdm-gobject/user.c	2012-03-20 05:11:28 +0000
+++ liblightdm-gobject/user.c	2012-04-25 17:06:32 +0000
@@ -1120,7 +1120,8 @@
     gchar *path;
     //gboolean have_dmrc;
 
-    priv->dmrc_file = g_key_file_new ();
+    if (!priv->dmrc_file)
+        priv->dmrc_file = g_key_file_new ();
 
     /* Load from the user directory */  
     path = g_build_filename (priv->home_directory, ".dmrc", NULL);