Diff of /trunk/src/gconf.c

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

revision 167 by harbaum, Mon Nov 9 07:50:37 2009 UTC revision 196 by harbaum, Thu Nov 19 07:39:00 2009 UTC
# Line 91  static store_t store[] = { Line 91  static store_t store[] = {
91    { "map_zoom",         STORE_INT,    OFFSET(map.zoom) },    { "map_zoom",         STORE_INT,    OFFSET(map.zoom) },
92    { "map_source",       STORE_INT,    OFFSET(map.source) },    { "map_source",       STORE_INT,    OFFSET(map.source) },
93  #endif  #endif
94    
95      { "gt_username",      STORE_STRING, OFFSET(gt.username) },
96      { "gt_password",      STORE_STRING, OFFSET(gt.password) },
97      { "gt_filename",      STORE_STRING, OFFSET(gt.filename) },
98      { "gt_distance",      STORE_FLOAT,  OFFSET(gt.distance) },
99      { "gt_lat",           STORE_FLOAT,  OFFSET(gt.lat) },
100      { "gt_lon",           STORE_FLOAT,  OFFSET(gt.lon) },
101      { "gt_flags",         STORE_INT,    OFFSET(gt.flags) },
102    
103    { NULL, -1, -1 }    { NULL, -1, -1 }
104  };  };
105    
# Line 184  void gconf_save_state(appdata_t *appdata Line 193  void gconf_save_state(appdata_t *appdata
193        if((char*)(*ptr)) {        if((char*)(*ptr)) {
194          gconf_client_set_string(appdata->gconf_client, key, (char*)(*ptr), NULL);          gconf_client_set_string(appdata->gconf_client, key, (char*)(*ptr), NULL);
195        }        }
196          g_free((char*)(*ptr));
197          *ptr = NULL;
198        break;        break;
199    
200      case STORE_BOOL:      case STORE_BOOL:
# Line 221  void gconf_load_state(appdata_t *appdata Line 232  void gconf_load_state(appdata_t *appdata
232    appdata->manual_goto.lat = appdata->manual_goto.lon = NAN;    appdata->manual_goto.lat = appdata->manual_goto.lon = NAN;
233    appdata->gps.lat = appdata->gps.lon = NAN;    appdata->gps.lat = appdata->gps.lon = NAN;
234    
235      appdata->gt.lat = appdata->gt.lon = NAN;
236    
237    /* ------------- get proxy settings -------------------- */    /* ------------- get proxy settings -------------------- */
238    if(gconf_client_get_bool(appdata->gconf_client,    if(gconf_client_get_bool(appdata->gconf_client,
239                             PROXY_KEY "use_http_proxy", NULL)) {                             PROXY_KEY "use_http_proxy", NULL)) {
Legend:
Removed from v.167  
changed lines
  Added in v.196