Diff of /trunk/src/gconf.c

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

revision 89 by harbaum, Tue Sep 1 11:16:30 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 78  static store_t store[] = { Line 76  static store_t store[] = {
76    { "cachelist_items",  STORE_INT,    OFFSET(cachelist_items) },    { "cachelist_items",  STORE_INT,    OFFSET(cachelist_items) },
77    { "compass_damping",  STORE_INT,    OFFSET(compass_damping) },    { "compass_damping",  STORE_INT,    OFFSET(compass_damping) },
78    { "cachelist_hide_found", STORE_BOOL, OFFSET(cachelist_hide_found) },    { "cachelist_hide_found", STORE_BOOL, OFFSET(cachelist_hide_found) },
79      { "cachelist_update", STORE_BOOL,   OFFSET(cachelist_update) },
80      { "disable_gcvote",   STORE_BOOL,   OFFSET(disable_gcvote) },
81      { "username",         STORE_STRING, OFFSET(username) },
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 90  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) },
98      { "geotoad/filename", STORE_STRING, OFFSET(gt.filename) },
99      { "geotoad/distance", STORE_FLOAT,  OFFSET(gt.distance) },
100      { "geotoad/lat",      STORE_FLOAT,  OFFSET(gt.lat) },
101      { "geotoad/lon",      STORE_FLOAT,  OFFSET(gt.lon) },
102      { "geotoad/flags",    STORE_INT,    OFFSET(gt.flags) },
103    
104    { NULL, -1, -1 }    { NULL, -1, -1 }
105  };  };
106    
# Line 111  static char *get_basename(char *name) { Line 122  static char *get_basename(char *name) {
122  }  }
123    
124  void gconf_remove_closed_name(appdata_t *appdata, char *filename) {  void gconf_remove_closed_name(appdata_t *appdata, char *filename) {
125      if(!filename || !strlen(filename)) return;
126    
127    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));
128    gconf_client_unset(appdata->gconf_client, key, NULL);    gconf_client_unset(appdata->gconf_client, key, NULL);
129    g_free(key);    g_free(key);
130  }  }
131    
132  void gconf_save_closed_name(appdata_t *appdata, char *filename, char *name) {  void gconf_save_closed_name(appdata_t *appdata, char *filename, char *name) {
133      if(!filename || !strlen(filename)) return;
134    
135    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));
136    gconf_client_set_string(appdata->gconf_client, key, name, NULL);    gconf_client_set_string(appdata->gconf_client, key, name, NULL);
137    g_free(key);    g_free(key);
138  }  }
139    
140  char *gconf_restore_closed_name(appdata_t *appdata, char *filename) {  char *gconf_restore_closed_name(appdata_t *appdata, char *filename) {
141      if(!filename || !strlen(filename)) return NULL;
142    
143    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));
144    char *ret = gconf_client_get_string(appdata->gconf_client, key, NULL);    char *ret = gconf_client_get_string(appdata->gconf_client, key, NULL);
145    g_free(key);    g_free(key);
# Line 132  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 */
155      if(appdata->proxy) {
156        proxy_t *proxy = appdata->proxy;
157    
158        if(proxy->authentication_password) g_free(proxy->authentication_password);
159        if(proxy->authentication_user)     g_free(proxy->authentication_user);
160        if(proxy->host)                    g_free(proxy->host);
161        if(proxy->ignore_hosts)            g_free(proxy->ignore_hosts);
162    
163        g_free(proxy);
164        appdata->proxy = NULL;
165      }
166    
167    gpx_t *gpx = appdata->gpx;    gpx_t *gpx = appdata->gpx;
168    while(gpx) {    while(gpx) {
169      char str[128];      char str[128];
# Line 170  void gconf_save_state(appdata_t *appdata Line 202  void gconf_save_state(appdata_t *appdata
202        if((char*)(*ptr)) {        if((char*)(*ptr)) {
203          gconf_client_set_string(appdata->gconf_client, key, (char*)(*ptr), NULL);          gconf_client_set_string(appdata->gconf_client, key, (char*)(*ptr), NULL);
204        }        }
205          g_free((char*)(*ptr));
206          *ptr = NULL;
207        break;        break;
208    
209      case STORE_BOOL:      case STORE_BOOL:
# Line 204  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;
245      appdata->gt.distance = 1.0;  // in km/mil
246    
247      /* ------------- get proxy settings -------------------- */
248      if(gconf_client_get_bool(appdata->gconf_client,
249                               PROXY_KEY "use_http_proxy", NULL)) {
250        proxy_t *proxy = appdata->proxy = g_new0(proxy_t, 1);
251    
252        /* get basic settings */
253        proxy->host = gconf_client_get_string(appdata->gconf_client,
254                                              PROXY_KEY "host", NULL);
255        proxy->port = gconf_client_get_int(appdata->gconf_client,
256                                           PROXY_KEY "port", NULL);
257        proxy->ignore_hosts =
258          gconf_client_get_string(appdata->gconf_client,
259                                  PROXY_KEY "ignore_hosts", NULL);
260    
261        /* check for authentication */
262        proxy->use_authentication =
263          gconf_client_get_bool(appdata->gconf_client,
264                                PROXY_KEY "use_authentication", NULL);
265    
266        if(proxy->use_authentication) {
267          proxy->authentication_user =
268            gconf_client_get_string(appdata->gconf_client,
269                                    PROXY_KEY "authentication_user", NULL);
270          proxy->authentication_password =
271            gconf_client_get_string(appdata->gconf_client,
272                                    PROXY_KEY "authentication_password", NULL);
273        }
274      }
275    
276      /* restore everything listed in the store table */
277      store_t *st = store;
278      while(st->key) {
279        void **ptr = ((void*)appdata) + st->offset;
280        char *key = g_strdup_printf(GCONF_PATH "%s", st->key);
281    
282        /* check if key is present */
283        GConfValue *value = gconf_client_get(appdata->gconf_client, key, NULL);
284        if(value) {
285          gconf_value_free(value);
286    
287          switch(st->type) {
288          case STORE_STRING: {
289            char **str = (char**)ptr;
290            *str = gconf_client_get_string(appdata->gconf_client, key, NULL);
291          } break;
292    
293          case STORE_BOOL:
294            *((int*)ptr) = gconf_client_get_bool(appdata->gconf_client, key, NULL);
295            break;
296    
297          case STORE_INT:
298            *((int*)ptr) = gconf_client_get_int(appdata->gconf_client, key, NULL);
299            break;
300    
301          case STORE_FLOAT:
302            *((float*)ptr) = gconf_client_get_float(appdata->gconf_client, key, NULL);
303            break;
304    
305          default:
306            printf("Unsupported type %d\n", st->type);
307            break;
308          }
309        }
310        g_free(key);
311        st++;
312      }
313    
314    int i, entries = gconf_client_get_int(appdata->gconf_client,    int i, entries = gconf_client_get_int(appdata->gconf_client,
315                                   GCONF_KEY_CNT, NULL);                                   GCONF_KEY_CNT, NULL);
# Line 217  void gconf_load_state(appdata_t *appdata Line 321  void gconf_load_state(appdata_t *appdata
321      char str[128];      char str[128];
322      snprintf(str, sizeof(str), GCONF_KEY_GPX, i);      snprintf(str, sizeof(str), GCONF_KEY_GPX, i);
323      char *fname = gconf_client_get_string(appdata->gconf_client, str, NULL);      char *fname = gconf_client_get_string(appdata->gconf_client, str, NULL);
   
324      if(fname) {      if(fname) {
325        /* check if there's a valid name stored for this file. */        /* check if there's a valid name stored for this file. */
326        /* if yes it's a "closed" file */        /* if yes it's a "closed" file */
# Line 229  void gconf_load_state(appdata_t *appdata Line 332  void gconf_load_state(appdata_t *appdata
332          (*gpx)->closed = TRUE;          (*gpx)->closed = TRUE;
333        } else {        } else {
334          if(g_file_test(fname, G_FILE_TEST_IS_DIR))          if(g_file_test(fname, G_FILE_TEST_IS_DIR))
335            *gpx = gpx_parse_dir(dialog, fname);            *gpx = gpx_parse_dir(dialog, fname, appdata->username);
336          else          else
337            *gpx = gpx_parse(dialog, fname);            *gpx = gpx_parse(dialog, fname, appdata->username);
338    
339          if(!*gpx) {          if(!*gpx) {
340            /* restoring the gpx file failed, mark it as unusable, but save */            /* restoring the gpx file failed, mark it as unusable, but save */
341            /* its presence for later use */            /* its presence for later use */
342    
343            /* create fake entry to remember this file for next load attempt */            /* create "closed" entry to remember this file for next */
344              /* load attempt */
345            *gpx = g_new0(gpx_t, 1);            *gpx = g_new0(gpx_t, 1);
346            (*gpx)->filename = fname;            (*gpx)->filename = fname;
347            (*gpx)->failed = TRUE;            char *p = fname;
348              if(strrchr(fname, '/'))
349                p = strrchr(fname, '/')+1;
350    
351              (*gpx)->name = g_strdup_printf(_("Failed to load: %s"), p);
352              (*gpx)->closed = TRUE;
353          } else          } else
354            free(fname);            free(fname);
355        }        }
356          gpx = &((*gpx)->next);
357      }      }
   
     gpx = &((*gpx)->next);  
358    }    }
359    
360    gpx_busy_dialog_destroy(dialog);    gpx_busy_dialog_destroy(dialog);
# Line 271  void gconf_load_state(appdata_t *appdata Line 379  void gconf_load_state(appdata_t *appdata
379      }      }
380    }    }
381    
   /* restore everything listed in the store table */  
   store_t *st = store;  
   while(st->key) {  
     void **ptr = ((void*)appdata) + st->offset;  
     char *key = g_strdup_printf(GCONF_PATH "%s", st->key);  
   
     /* check if key is present */  
     GConfValue *value = gconf_client_get(appdata->gconf_client, key, NULL);  
     if(value) {  
       gconf_value_free(value);  
   
       switch(st->type) {  
       case STORE_STRING: {  
         char **str = (char**)ptr;  
         *str = gconf_client_get_string(appdata->gconf_client, key, NULL);  
       } break;  
   
       case STORE_BOOL:  
         *((int*)ptr) = gconf_client_get_bool(appdata->gconf_client, key, NULL);  
         break;  
   
       case STORE_INT:  
         *((int*)ptr) = gconf_client_get_int(appdata->gconf_client, key, NULL);  
         break;  
   
       case STORE_FLOAT:  
         *((float*)ptr) = gconf_client_get_float(appdata->gconf_client, key, NULL);  
         break;  
   
       default:  
         printf("Unsupported type %d\n", st->type);  
         break;  
       }  
     }  
     g_free(key);  
     st++;  
   }  
   
382    /* ----- set all kinds of defaults ------- */    /* ----- set all kinds of defaults ------- */
383    
384    if(!appdata->compass_damping) appdata->compass_damping = 1;    if(!appdata->compass_damping) appdata->compass_damping = 1;
# Line 320  void gconf_load_state(appdata_t *appdata Line 390  void gconf_load_state(appdata_t *appdata
390      appdata->search = SEARCH_NAME | SEARCH_ID;      appdata->search = SEARCH_NAME | SEARCH_ID;
391    
392    if(!appdata->image_path) {    if(!appdata->image_path) {
393    #ifdef USE_MAEMO
394        /* update cachelist by default */
395        appdata->cachelist_update = TRUE;
396    #endif
397    
398      /* use gps by default */      /* use gps by default */
399      appdata->use_gps = TRUE;      appdata->use_gps = TRUE;
# Line 421  void gconf_load_state(appdata_t *appdata Line 495  void gconf_load_state(appdata_t *appdata
495      char *name = g_strdup(ICONPATH "welcome.gpx");      char *name = g_strdup(ICONPATH "welcome.gpx");
496      dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));      dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
497      printf("No GPX file loaded, trying to load demo\n");      printf("No GPX file loaded, trying to load demo\n");
498      appdata->gpx = gpx_parse(dialog, name);      appdata->gpx = gpx_parse(dialog, name, appdata->username);
499      gpx_busy_dialog_destroy(dialog);      gpx_busy_dialog_destroy(dialog);
500      g_free(name);      g_free(name);
501    }    }
Legend:
Removed from v.89  
changed lines
  Added in v.246