Diff of /trunk/src/gconf.c

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

revision 196 by harbaum, Thu Nov 19 07:39:00 2009 UTC revision 214 by harbaum, Thu Nov 26 10:05:23 2009 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 80  static store_t store[] = { Line 78  static store_t store[] = {
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) },    { "cachelist_update", STORE_BOOL,   OFFSET(cachelist_update) },
80    { "disable_gcvote",   STORE_BOOL,   OFFSET(disable_gcvote) },    { "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) },
# Line 92  static store_t store[] = { Line 91  static store_t store[] = {
91    { "map_source",       STORE_INT,    OFFSET(map.source) },    { "map_source",       STORE_INT,    OFFSET(map.source) },
92  #endif  #endif
93    
94    { "gt_username",      STORE_STRING, OFFSET(gt.username) },    { "geotoad/password", STORE_STRING, OFFSET(gt.password) },
95    { "gt_password",      STORE_STRING, OFFSET(gt.password) },    { "geotoad/filename", STORE_STRING, OFFSET(gt.filename) },
96    { "gt_filename",      STORE_STRING, OFFSET(gt.filename) },    { "geotoad/distance", STORE_FLOAT,  OFFSET(gt.distance) },
97    { "gt_distance",      STORE_FLOAT,  OFFSET(gt.distance) },    { "geotoad/lat",      STORE_FLOAT,  OFFSET(gt.lat) },
98    { "gt_lat",           STORE_FLOAT,  OFFSET(gt.lat) },    { "geotoad/lon",      STORE_FLOAT,  OFFSET(gt.lon) },
99    { "gt_lon",           STORE_FLOAT,  OFFSET(gt.lon) },    { "geotoad/flags",    STORE_INT,    OFFSET(gt.flags) },
   { "gt_flags",         STORE_INT,    OFFSET(gt.flags) },  
100    
101    { NULL, -1, -1 }    { NULL, -1, -1 }
102  };  };
# Line 121  static char *get_basename(char *name) { Line 119  static char *get_basename(char *name) {
119  }  }
120    
121  void gconf_remove_closed_name(appdata_t *appdata, char *filename) {  void gconf_remove_closed_name(appdata_t *appdata, char *filename) {
122      if(!filename || !strlen(filename)) return;
123    
124    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));
125    gconf_client_unset(appdata->gconf_client, key, NULL);    gconf_client_unset(appdata->gconf_client, key, NULL);
126    g_free(key);    g_free(key);
127  }  }
128    
129  void gconf_save_closed_name(appdata_t *appdata, char *filename, char *name) {  void gconf_save_closed_name(appdata_t *appdata, char *filename, char *name) {
130      if(!filename || !strlen(filename)) return;
131    
132    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));
133    gconf_client_set_string(appdata->gconf_client, key, name, NULL);    gconf_client_set_string(appdata->gconf_client, key, name, NULL);
134    g_free(key);    g_free(key);
135  }  }
136    
137  char *gconf_restore_closed_name(appdata_t *appdata, char *filename) {  char *gconf_restore_closed_name(appdata_t *appdata, char *filename) {
138      if(!filename || !strlen(filename)) return NULL;
139    
140    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));    char *key = g_strdup_printf(GCONF_KEY_CLOSED, get_basename(filename));
141    char *ret = gconf_client_get_string(appdata->gconf_client, key, NULL);    char *ret = gconf_client_get_string(appdata->gconf_client, key, NULL);
142    g_free(key);    g_free(key);
# Line 229  void gconf_load_state(appdata_t *appdata Line 233  void gconf_load_state(appdata_t *appdata
233    
234    /* default positions are invalid */    /* default positions are invalid */
235    appdata->home.lat = appdata->home.lon = NAN;    appdata->home.lat = appdata->home.lon = NAN;
   appdata->manual_goto.lat = appdata->manual_goto.lon = NAN;  
236    appdata->gps.lat = appdata->gps.lon = NAN;    appdata->gps.lat = appdata->gps.lon = NAN;
237    
238    appdata->gt.lat = appdata->gt.lon = NAN;    appdata->gt.lat = appdata->gt.lon = NAN;
239      appdata->gt.distance = 1.0;  // in km/mil
240    
241    /* ------------- get proxy settings -------------------- */    /* ------------- get proxy settings -------------------- */
242    if(gconf_client_get_bool(appdata->gconf_client,    if(gconf_client_get_bool(appdata->gconf_client,
# Line 263  void gconf_load_state(appdata_t *appdata Line 267  void gconf_load_state(appdata_t *appdata
267      }      }
268    }    }
269    
270      /* restore everything listed in the store table */
271      store_t *st = store;
272      while(st->key) {
273        void **ptr = ((void*)appdata) + st->offset;
274        char *key = g_strdup_printf(GCONF_PATH "%s", st->key);
275    
276        /* check if key is present */
277        GConfValue *value = gconf_client_get(appdata->gconf_client, key, NULL);
278        if(value) {
279          gconf_value_free(value);
280    
281          switch(st->type) {
282          case STORE_STRING: {
283            char **str = (char**)ptr;
284            *str = gconf_client_get_string(appdata->gconf_client, key, NULL);
285          } break;
286    
287          case STORE_BOOL:
288            *((int*)ptr) = gconf_client_get_bool(appdata->gconf_client, key, NULL);
289            break;
290    
291          case STORE_INT:
292            *((int*)ptr) = gconf_client_get_int(appdata->gconf_client, key, NULL);
293            break;
294    
295          case STORE_FLOAT:
296            *((float*)ptr) = gconf_client_get_float(appdata->gconf_client, key, NULL);
297            break;
298    
299          default:
300            printf("Unsupported type %d\n", st->type);
301            break;
302          }
303        }
304        g_free(key);
305        st++;
306      }
307    
308    int i, entries = gconf_client_get_int(appdata->gconf_client,    int i, entries = gconf_client_get_int(appdata->gconf_client,
309                                   GCONF_KEY_CNT, NULL);                                   GCONF_KEY_CNT, NULL);
310    
# Line 284  void gconf_load_state(appdata_t *appdata Line 326  void gconf_load_state(appdata_t *appdata
326          (*gpx)->closed = TRUE;          (*gpx)->closed = TRUE;
327        } else {        } else {
328          if(g_file_test(fname, G_FILE_TEST_IS_DIR))          if(g_file_test(fname, G_FILE_TEST_IS_DIR))
329            *gpx = gpx_parse_dir(dialog, fname);            *gpx = gpx_parse_dir(dialog, fname, appdata->username);
330          else          else
331            *gpx = gpx_parse(dialog, fname);            *gpx = gpx_parse(dialog, fname, appdata->username);
332    
333          if(!*gpx) {          if(!*gpx) {
334            /* restoring the gpx file failed, mark it as unusable, but save */            /* restoring the gpx file failed, mark it as unusable, but save */
# Line 331  void gconf_load_state(appdata_t *appdata Line 373  void gconf_load_state(appdata_t *appdata
373      }      }
374    }    }
375    
   /* 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++;  
   }  
   
376    /* ----- set all kinds of defaults ------- */    /* ----- set all kinds of defaults ------- */
377    
378    if(!appdata->compass_damping) appdata->compass_damping = 1;    if(!appdata->compass_damping) appdata->compass_damping = 1;
# Line 485  void gconf_load_state(appdata_t *appdata Line 489  void gconf_load_state(appdata_t *appdata
489      char *name = g_strdup(ICONPATH "welcome.gpx");      char *name = g_strdup(ICONPATH "welcome.gpx");
490      dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));      dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
491      printf("No GPX file loaded, trying to load demo\n");      printf("No GPX file loaded, trying to load demo\n");
492      appdata->gpx = gpx_parse(dialog, name);      appdata->gpx = gpx_parse(dialog, name, appdata->username);
493      gpx_busy_dialog_destroy(dialog);      gpx_busy_dialog_destroy(dialog);
494      g_free(name);      g_free(name);
495    }    }
Legend:
Removed from v.196  
changed lines
  Added in v.214