[maemo-commits] [maemo-commits] r13482 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-08-30 14:52:08 +0300 (Thu, 30 Aug 2007)
New Revision: 13482

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c
Log:

2007-08-30 Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-select-plugins-dialog.c: do not free the
	desktop path after all



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-30 11:23:43 UTC (rev 13481)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-30 11:52:08 UTC (rev 13482)
@@ -1,5 +1,10 @@
 2007-08-30 Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-select-plugins-dialog.c: do not free the
+	desktop path after all
+
+2007-08-30 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildonwm/hd-keys.c: dbus_message_append_args takes addresses,
 	not values. Fixes: NB#67352
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c	2007-08-30 11:23:43 UTC (rev 13481)
+++ projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c	2007-08-30 11:52:08 UTC (rev 13482)
@@ -180,8 +180,6 @@
                                G_KEY_FILE_NONE,
                                &error);
 
-    g_free (desktop_path);
-
     if (error)
     {
       g_warning ("Error loading plugin configuration file: %s", error->message);
@@ -189,7 +187,9 @@
       g_error_free (error);
       g_dir_close (dir);
       g_key_file_free (keyfile);
+      g_free (desktop_path);
 
+
       return NULL;
     }
 
@@ -206,6 +206,7 @@
       g_error_free (error);
       g_dir_close (dir);
       g_key_file_free (keyfile);
+      g_free (desktop_path);
 
       return NULL;
     }