[maemo-commits] [maemo-commits] r8324 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop

[From: www-data at stage.maemo.org]

Author: jobi
Date: 2006-11-27 12:36:57 +0200 (Mon, 27 Nov 2006)
New Revision: 8324

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildonmenu.c
Log:

2006-11-27  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/libhildonmenu.c: Fixed a potential crash when
	no Type = is provided.



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-27 10:32:21 UTC (rev 8323)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2006-11-27 10:36:57 UTC (rev 8324)
@@ -1,3 +1,8 @@
+2006-11-27  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/libhildonmenu.c: Fixed a potential crash when
+	no Type = is provided.
+
 2006-11-27  Moises Martinez  <moises.martinzes at nokia.com>
 
 	* libhildondesktop/libhildondesktop.h: Added macros for GTypeModule 
@@ -21,6 +26,16 @@
 
 2006-11-23  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-plugin-loader-factory.c: use the legacy loader for
+	 Type = HildonHomeApplet
+	* src/hd-desktop.c: read layout configuration after creating
+	window
+	* data/hildon-home-layout.conf: added
+	* libhildondesktop/hildon-home-area.c: Implement _add, keep track
+	of the layout configuration and place applets accordingly
+
+2006-11-23  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-plugin-loader.c:
 	(hd_plugin_loader_load()) use _GET_CLASS instead of _CLASS
 

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildonmenu.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildonmenu.c	2006-11-27 10:32:21 UTC (rev 8323)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildonmenu.c	2006-11-27 10:36:57 UTC (rev 8324)
@@ -275,6 +275,8 @@
 				g_str_has_suffix(current_path,
 					DESKTOP_FILE_SUFFIX)) {
 
+            gchar *type = NULL;
+
 			key_file = g_key_file_new();
 
 			/* Let's read the interesting stuff */
@@ -293,11 +295,11 @@
 			}
 						
 
-			gchar *type = g_key_file_get_string(
-					key_file,
-					DESKTOP_ENTRY_GROUP,
-					DESKTOP_ENTRY_TYPE_FIELD,
-					NULL);
+			type = g_key_file_get_string(
+                                         key_file,
+                                         DESKTOP_ENTRY_GROUP,
+                                         DESKTOP_ENTRY_TYPE_FIELD,
+                                         NULL);
 
 			/* We're only interested in apps */
 			if ( !type || strcmp(type, "Application") != 0 ) {