Diff of /trunk/src/gconf.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 34 by harbaum, Wed Jul 29 19:24:15 2009 UTC revision 129 by harbaum, Tue Sep 29 14:30:16 2009 UTC
# Line 78  static store_t store[] = { Line 78  static store_t store[] = {
78    { "cachelist_items",  STORE_INT,    OFFSET(cachelist_items) },    { "cachelist_items",  STORE_INT,    OFFSET(cachelist_items) },
79    { "compass_damping",  STORE_INT,    OFFSET(compass_damping) },    { "compass_damping",  STORE_INT,    OFFSET(compass_damping) },
80    { "cachelist_hide_found", STORE_BOOL, OFFSET(cachelist_hide_found) },    { "cachelist_hide_found", STORE_BOOL, OFFSET(cachelist_hide_found) },
81      { "cachelist_update", STORE_BOOL,   OFFSET(cachelist_update) },
82  #ifdef USE_MAEMO  #ifdef USE_MAEMO
83    { "mmpoi_dontlaunch", STORE_BOOL,   OFFSET(mmpoi_dontlaunch) },    { "mmpoi_dontlaunch", STORE_BOOL,   OFFSET(mmpoi_dontlaunch) },
84    { "cachelist_dss",    STORE_BOOL,   OFFSET(cachelist_disable_screensaver) },    { "cachelist_dss",    STORE_BOOL,   OFFSET(cachelist_disable_screensaver) },
85    { "goto_dss",         STORE_BOOL,   OFFSET(goto_disable_screensaver) },    { "goto_dss",         STORE_BOOL,   OFFSET(goto_disable_screensaver) },
   { "cachelist_update", STORE_BOOL,   OFFSET(cachelist_update) },  
86  #endif  #endif
87    #ifdef ENABLE_OSM_GPS_MAP
88      { "map_lat",          STORE_FLOAT,  OFFSET(map.pos.lat) },
89      { "map_lon",          STORE_FLOAT,  OFFSET(map.pos.lon) },
90      { "map_zoom",         STORE_INT,    OFFSET(map.zoom) },
91      { "map_source",       STORE_INT,    OFFSET(map.source) },
92    #endif
93    { NULL, -1, -1 }    { NULL, -1, -1 }
94  };  };
95    
# Line 212  void gconf_load_state(appdata_t *appdata Line 217  void gconf_load_state(appdata_t *appdata
217      char str[128];      char str[128];
218      snprintf(str, sizeof(str), GCONF_KEY_GPX, i);      snprintf(str, sizeof(str), GCONF_KEY_GPX, i);
219      char *fname = gconf_client_get_string(appdata->gconf_client, str, NULL);      char *fname = gconf_client_get_string(appdata->gconf_client, str, NULL);
   
220      if(fname) {      if(fname) {
221        /* check if there's a valid name stored for this file. */        /* check if there's a valid name stored for this file. */
222        /* if yes it's a "closed" file */        /* if yes it's a "closed" file */
# Line 228  void gconf_load_state(appdata_t *appdata Line 232  void gconf_load_state(appdata_t *appdata
232          else          else
233            *gpx = gpx_parse(dialog, fname);            *gpx = gpx_parse(dialog, fname);
234    
235          free(fname);          if(!*gpx) {
236              /* restoring the gpx file failed, mark it as unusable, but save */
237              /* its presence for later use */
238    
239              /* create "closed" entry to remember this file for next */
240              /* load attempt */
241              *gpx = g_new0(gpx_t, 1);
242              (*gpx)->filename = fname;
243              char *p = fname;
244              if(strrchr(fname, '/'))
245                p = strrchr(fname, '/')+1;
246    
247              (*gpx)->name = g_strdup_printf(_("Failed to load: %s"), p);
248              (*gpx)->closed = TRUE;
249            } else
250              free(fname);
251        }        }
     }  
   
     /* use next gpx entry of this was loaded successfully */  
     if(*gpx)  
252        gpx = &((*gpx)->next);        gpx = &((*gpx)->next);
253        }
254    }    }
255    
256    gpx_busy_dialog_destroy(dialog);    gpx_busy_dialog_destroy(dialog);
# Line 308  void gconf_load_state(appdata_t *appdata Line 324  void gconf_load_state(appdata_t *appdata
324      appdata->search = SEARCH_NAME | SEARCH_ID;      appdata->search = SEARCH_NAME | SEARCH_ID;
325    
326    if(!appdata->image_path) {    if(!appdata->image_path) {
327    #ifdef USE_MAEMO
328        /* update cachelist by default */
329        appdata->cachelist_update = TRUE;
330    #endif
331    
332      /* use gps by default */      /* use gps by default */
333      appdata->use_gps = TRUE;      appdata->use_gps = TRUE;
# Line 326  void gconf_load_state(appdata_t *appdata Line 346  void gconf_load_state(appdata_t *appdata
346  #endif  #endif
347      appdata->image_path = strdup(DEFAULT_IMAGE_PATH);      appdata->image_path = strdup(DEFAULT_IMAGE_PATH);
348    
349        /* check if this path is actually accessible */
350        /* and change it to the current users home if not */
351        /* (this should only happen on scratchbox) */
352        if(!g_file_test(appdata->image_path, G_FILE_TEST_IS_DIR)) {
353          if(g_mkdir_with_parents(appdata->image_path, 0700) != 0) {
354            char *p = getenv("HOME");
355            if(!p) p = "/tmp/";
356    
357            appdata->image_path =
358              g_strdup_printf("%s%s%s", p,
359                              (p[strlen(p)-1]!='/')?"/":"",
360                              DEFAULT_IMAGE_PATH_HOME);
361            printf("using alt path %s\n", appdata->image_path);
362          }
363        }
364    
365    } else {    } else {
366      /* some versions old versions messed up the path */      /* some versions old versions messed up the path */
367      if(appdata->image_path[strlen(appdata->image_path)-1] != '/') {      if(appdata->image_path[strlen(appdata->image_path)-1] != '/') {
Legend:
Removed from v.34  
changed lines
  Added in v.129