Diff of /trunk/src/gconf.c

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

revision 103 by harbaum, Wed Sep 9 11:50:50 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  #ifdef ENABLE_OSM_GPS_MAP
88    { "map_lat",          STORE_FLOAT,  OFFSET(map.pos.lat) },    { "map_lat",          STORE_FLOAT,  OFFSET(map.pos.lat) },
# Line 236  void gconf_load_state(appdata_t *appdata Line 236  void gconf_load_state(appdata_t *appdata
236            /* restoring the gpx file failed, mark it as unusable, but save */            /* restoring the gpx file failed, mark it as unusable, but save */
237            /* its presence for later use */            /* its presence for later use */
238    
239            /* create fake entry to remember this file for next load attempt */            /* create "closed" entry to remember this file for next */
240              /* load attempt */
241            *gpx = g_new0(gpx_t, 1);            *gpx = g_new0(gpx_t, 1);
242            (*gpx)->filename = fname;            (*gpx)->filename = fname;
243            (*gpx)->failed = TRUE;            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          } else
250            free(fname);            free(fname);
251        }        }
# Line 318  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;
Legend:
Removed from v.103  
changed lines
  Added in v.129