Diff of /trunk/src/gconf.c

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

revision 211 by harbaum, Wed Nov 25 10:13:26 2009 UTC revision 246 by harbaum, Tue Jan 19 20:26:37 2010 UTC
# Line 67  static store_t store[] = { Line 67  static store_t store[] = {
67    { "compass_locked",   STORE_BOOL,   OFFSET(compass_locked) },    { "compass_locked",   STORE_BOOL,   OFFSET(compass_locked) },
68    { "latitude",         STORE_FLOAT,  OFFSET(home.lat) },    { "latitude",         STORE_FLOAT,  OFFSET(home.lat) },
69    { "longitude",        STORE_FLOAT,  OFFSET(home.lon) },    { "longitude",        STORE_FLOAT,  OFFSET(home.lon) },
   { "manual_goto_lat",  STORE_FLOAT,  OFFSET(manual_goto.lat) },  
   { "manual_goto_lon",  STORE_FLOAT,  OFFSET(manual_goto.lon) },  
70    { "gps_lat",          STORE_FLOAT,  OFFSET(gps.lat) },    { "gps_lat",          STORE_FLOAT,  OFFSET(gps.lat) },
71    { "gps_lon",          STORE_FLOAT,  OFFSET(gps.lon) },    { "gps_lon",          STORE_FLOAT,  OFFSET(gps.lon) },
72    { "search_in",        STORE_INT,    OFFSET(search) },    { "search_in",        STORE_INT,    OFFSET(search) },
# Line 92  static store_t store[] = { Line 90  static store_t store[] = {
90    { "map_zoom",         STORE_INT,    OFFSET(map.zoom) },    { "map_zoom",         STORE_INT,    OFFSET(map.zoom) },
91    { "map_source",       STORE_INT,    OFFSET(map.source) },    { "map_source",       STORE_INT,    OFFSET(map.source) },
92  #endif  #endif
93    #ifdef ESPEAK
94      { "espeak/enabled",   STORE_BOOL,   OFFSET(espeak.enabled) },
95    #endif
96    
97    { "geotoad/password", STORE_STRING, OFFSET(gt.password) },    { "geotoad/password", STORE_STRING, OFFSET(gt.password) },
98    { "geotoad/filename", STORE_STRING, OFFSET(gt.filename) },    { "geotoad/filename", STORE_STRING, OFFSET(gt.filename) },
# Line 148  char *gconf_restore_closed_name(appdata_ Line 149  char *gconf_restore_closed_name(appdata_
149  void gconf_save_state(appdata_t *appdata) {  void gconf_save_state(appdata_t *appdata) {
150    int entries = 0;    int entries = 0;
151    
152      printf("saving gconf state\n");
153    
154    /* free proxy settings */    /* free proxy settings */
155    if(appdata->proxy) {    if(appdata->proxy) {
156      proxy_t *proxy = appdata->proxy;      proxy_t *proxy = appdata->proxy;
# Line 235  void gconf_load_state(appdata_t *appdata Line 238  void gconf_load_state(appdata_t *appdata
238    
239    /* default positions are invalid */    /* default positions are invalid */
240    appdata->home.lat = appdata->home.lon = NAN;    appdata->home.lat = appdata->home.lon = NAN;
   appdata->manual_goto.lat = appdata->manual_goto.lon = NAN;  
241    appdata->gps.lat = appdata->gps.lon = NAN;    appdata->gps.lat = appdata->gps.lon = NAN;
242      appdata->geomath.lat = appdata->geomath.lon = NAN;
243    
244    appdata->gt.lat = appdata->gt.lon = NAN;    appdata->gt.lat = appdata->gt.lon = NAN;
245    appdata->gt.distance = 1.0;  // in km/mil    appdata->gt.distance = 1.0;  // in km/mil

Legend:
Removed from v.211  
changed lines
  Added in v.246