[maemo-commits] [maemo-commits] r14040 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-24 16:45:35 +0300 (Mon, 24 Sep 2007)
New Revision: 14040

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c
Log:

2007-09-24 Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/libhildonmenu.c: Fixed potential leaks of
	the .desktop GKeyFile stuctures



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 13:32:13 UTC (rev 14039)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 13:45:35 UTC (rev 14040)
@@ -1,5 +1,10 @@
 2007-09-24 Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildondesktop/libhildonmenu.c: Fixed potential leaks of
+	the .desktop GKeyFile stuctures
+
+2007-09-24 Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-menu.c: fixed leaks
 	of the children list in several places
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c	2007-09-24 13:32:13 UTC (rev 14039)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c	2007-09-24 13:45:35 UTC (rev 14040)
@@ -290,15 +290,15 @@
 
 				g_warning("Error reading '%s': %s\n",
 						current_path, error->message);
-				
+
 				g_error_free(error);
 				error = NULL;
-				
-	                	g_free(current_path);
-				
+
+	                        g_free(current_path);
+                                g_key_file_free (key_file);
+
 				continue;
 			}
-						
 
                         /* Check for the optional NoDisplay key.
                          * If found and true, continue, we won't
@@ -313,6 +313,7 @@
                         else if (no_display)
                         {
                           g_free (current_path);
+                          g_key_file_free (key_file);
                           continue;
                         }