[maemo-commits] [maemo-commits] r16559 - in projects/haf/branches/hildon-fm/fremantle_legacy: . hildon-fm

[From: subversion at stage.maemo.org]

Author: yangli
Date: 2008-11-04 11:44:05 +0200 (Tue, 04 Nov 2008)
New Revision: 16559

Modified:
   projects/haf/branches/hildon-fm/fremantle_legacy/ChangeLog
   projects/haf/branches/hildon-fm/fremantle_legacy/hildon-fm/hildon-file-chooser-dialog.c
Log:
set the device to null if failed to get the device name

Modified: projects/haf/branches/hildon-fm/fremantle_legacy/ChangeLog
===================================================================
--- projects/haf/branches/hildon-fm/fremantle_legacy/ChangeLog	2008-11-03 14:44:16 UTC (rev 16558)
+++ projects/haf/branches/hildon-fm/fremantle_legacy/ChangeLog	2008-11-04 09:44:05 UTC (rev 16559)
@@ -1,3 +1,7 @@
+2008-11-04 Yang Li <yang.li at d\igia.com>
+	* hildon-fm/hildon-file-chooser-dialog.c:
+	set the virtual root name to null if failed to get the device name.
+	
 2008-10-15 Valentin Rabinovich <valentin.rabinovich at d\igia.com>
 
 	* Releasing 1:2.0.8 - before porting FM UI to Hildon 2.2 style

Modified: projects/haf/branches/hildon-fm/fremantle_legacy/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle_legacy/hildon-fm/hildon-file-chooser-dialog.c	2008-11-03 14:44:16 UTC (rev 16558)
+++ projects/haf/branches/hildon-fm/fremantle_legacy/hildon-fm/hildon-file-chooser-dialog.c	2008-11-04 09:44:05 UTC (rev 16559)
@@ -2150,7 +2150,7 @@
     while(g_strcasecmp(title, "/")/*!g_strcasecmp(gtk_tree_path_str, "0")*/){
         //free(title);     
 	if(strlen(title) == 0)
-	  list = g_list_append(list, "Nokia"); 
+	  list = g_list_append(list, " "); 
 	else
 	  list = g_list_append(list, title); 
 	cur_iter = iter;
@@ -2165,13 +2165,15 @@
     path_string = g_malloc(MAXPATHLEN);
     memset(path_string, 0, MAXPATHLEN);
     for (list = g_list_last(list); list; list = list->prev) {
-      if(strlen(path_string) == 0)
-	strcpy(path_string, list->data);
-      else {
-	if(strlen(list->data) + strlen(path_string) < MAXPATHLEN)
-	  strcat(path_string, list->data);
-	else
-	  ULOG_INFO("path length exceeds the maximum path length 1024\n");
+      if(strlen(list->data) > 0) {
+	if(strlen(path_string) == 0)
+	  strcpy(path_string, list->data);
+	else {
+	  if(strlen(list->data) + strlen(path_string) < MAXPATHLEN)
+	    strcat(path_string, list->data);
+	  else
+	    ULOG_INFO("path length exceeds the maximum path length 1024\n");
+	}
       }
       strcat(path_string, "/");
     }