Diff of /trunk/src/gconf.c

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

revision 129 by harbaum, Tue Sep 29 14:30:16 2009 UTC revision 167 by harbaum, Mon Nov 9 07:50:37 2009 UTC
# Line 79  static store_t store[] = { Line 79  static store_t store[] = {
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) },    { "cachelist_update", STORE_BOOL,   OFFSET(cachelist_update) },
82      { "disable_gcvote",   STORE_BOOL,   OFFSET(disable_gcvote) },
83  #ifdef USE_MAEMO  #ifdef USE_MAEMO
84    { "mmpoi_dontlaunch", STORE_BOOL,   OFFSET(mmpoi_dontlaunch) },    { "mmpoi_dontlaunch", STORE_BOOL,   OFFSET(mmpoi_dontlaunch) },
85    { "cachelist_dss",    STORE_BOOL,   OFFSET(cachelist_disable_screensaver) },    { "cachelist_dss",    STORE_BOOL,   OFFSET(cachelist_disable_screensaver) },
# Line 132  char *gconf_restore_closed_name(appdata_ Line 133  char *gconf_restore_closed_name(appdata_
133  void gconf_save_state(appdata_t *appdata) {  void gconf_save_state(appdata_t *appdata) {
134    int entries = 0;    int entries = 0;
135    
136      /* free proxy settings */
137      if(appdata->proxy) {
138        proxy_t *proxy = appdata->proxy;
139    
140        if(proxy->authentication_password) g_free(proxy->authentication_password);
141        if(proxy->authentication_user)     g_free(proxy->authentication_user);
142        if(proxy->host)                    g_free(proxy->host);
143        if(proxy->ignore_hosts)            g_free(proxy->ignore_hosts);
144    
145        g_free(proxy);
146        appdata->proxy = NULL;
147      }
148    
149    gpx_t *gpx = appdata->gpx;    gpx_t *gpx = appdata->gpx;
150    while(gpx) {    while(gpx) {
151      char str[128];      char str[128];
# Line 207  void gconf_load_state(appdata_t *appdata Line 221  void gconf_load_state(appdata_t *appdata
221    appdata->manual_goto.lat = appdata->manual_goto.lon = NAN;    appdata->manual_goto.lat = appdata->manual_goto.lon = NAN;
222    appdata->gps.lat = appdata->gps.lon = NAN;    appdata->gps.lat = appdata->gps.lon = NAN;
223    
224      /* ------------- get proxy settings -------------------- */
225      if(gconf_client_get_bool(appdata->gconf_client,
226                               PROXY_KEY "use_http_proxy", NULL)) {
227        proxy_t *proxy = appdata->proxy = g_new0(proxy_t, 1);
228    
229        /* get basic settings */
230        proxy->host = gconf_client_get_string(appdata->gconf_client,
231                                              PROXY_KEY "host", NULL);
232        proxy->port = gconf_client_get_int(appdata->gconf_client,
233                                           PROXY_KEY "port", NULL);
234        proxy->ignore_hosts =
235          gconf_client_get_string(appdata->gconf_client,
236                                  PROXY_KEY "ignore_hosts", NULL);
237    
238        /* check for authentication */
239        proxy->use_authentication =
240          gconf_client_get_bool(appdata->gconf_client,
241                                PROXY_KEY "use_authentication", NULL);
242    
243        if(proxy->use_authentication) {
244          proxy->authentication_user =
245            gconf_client_get_string(appdata->gconf_client,
246                                    PROXY_KEY "authentication_user", NULL);
247          proxy->authentication_password =
248            gconf_client_get_string(appdata->gconf_client,
249                                    PROXY_KEY "authentication_password", NULL);
250        }
251      }
252    
253    int i, entries = gconf_client_get_int(appdata->gconf_client,    int i, entries = gconf_client_get_int(appdata->gconf_client,
254                                   GCONF_KEY_CNT, NULL);                                   GCONF_KEY_CNT, NULL);
255    
Legend:
Removed from v.129  
changed lines
  Added in v.167