--- trunk/src/gconf.c	2009/08/24 09:23:36	74
+++ trunk/src/gconf.c	2009/09/29 14:30:16	129
@@ -78,16 +78,17 @@
   { "cachelist_items",  STORE_INT,    OFFSET(cachelist_items) },
   { "compass_damping",  STORE_INT,    OFFSET(compass_damping) },
   { "cachelist_hide_found", STORE_BOOL, OFFSET(cachelist_hide_found) },
+  { "cachelist_update", STORE_BOOL,   OFFSET(cachelist_update) },
 #ifdef USE_MAEMO
   { "mmpoi_dontlaunch", STORE_BOOL,   OFFSET(mmpoi_dontlaunch) },
   { "cachelist_dss",    STORE_BOOL,   OFFSET(cachelist_disable_screensaver) },
   { "goto_dss",         STORE_BOOL,   OFFSET(goto_disable_screensaver) },
-  { "cachelist_update", STORE_BOOL,   OFFSET(cachelist_update) },
 #endif
 #ifdef ENABLE_OSM_GPS_MAP
   { "map_lat",          STORE_FLOAT,  OFFSET(map.pos.lat) },
   { "map_lon",          STORE_FLOAT,  OFFSET(map.pos.lon) },
   { "map_zoom",         STORE_INT,    OFFSET(map.zoom) },
+  { "map_source",       STORE_INT,    OFFSET(map.source) },
 #endif
   { NULL, -1, -1 }
 };
@@ -216,7 +217,6 @@
     char str[128];
     snprintf(str, sizeof(str), GCONF_KEY_GPX, i);
     char *fname = gconf_client_get_string(appdata->gconf_client, str, NULL);
-
     if(fname) {
       /* check if there's a valid name stored for this file. */
       /* if yes it's a "closed" file */
@@ -236,16 +236,21 @@
 	  /* restoring the gpx file failed, mark it as unusable, but save */
 	  /* its presence for later use */
 	  
-	  /* create fake entry to remember this file for next load attempt */
+	  /* create "closed" entry to remember this file for next */
+	  /* load attempt */
 	  *gpx = g_new0(gpx_t, 1);
 	  (*gpx)->filename = fname;
-	  (*gpx)->failed = TRUE;
+	  char *p = fname;
+	  if(strrchr(fname, '/'))
+	    p = strrchr(fname, '/')+1;
+
+	  (*gpx)->name = g_strdup_printf(_("Failed to load: %s"), p);
+	  (*gpx)->closed = TRUE;
 	} else
 	  free(fname);
       }
+      gpx = &((*gpx)->next);
     }
-
-    gpx = &((*gpx)->next);
   }
 
   gpx_busy_dialog_destroy(dialog);
@@ -319,6 +324,10 @@
     appdata->search = SEARCH_NAME | SEARCH_ID;
 
   if(!appdata->image_path) {
+#ifdef USE_MAEMO
+    /* update cachelist by default */
+    appdata->cachelist_update = TRUE;
+#endif
 
     /* use gps by default */
     appdata->use_gps = TRUE;