Diff of /trunk/src/settings.c

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

revision 178 by harbaum, Tue Jun 16 15:27:37 2009 UTC revision 179 by harbaum, Thu Jun 18 12:15:17 2009 UTC
# Line 112  settings_t *settings_load(void) { Line 112  settings_t *settings_load(void) {
112        if(value)        if(value)
113          gconf_value_free(value);          gconf_value_free(value);
114        else {        else {
115    #if 0  // don't explain this now ...
116          messagef(NULL, _("Icon drawing is disabled"),          messagef(NULL, _("Icon drawing is disabled"),
117                   _("You are running this version of osm2go on a Internet "                   _("You are running this version of osm2go on a Internet "
118                     "Tablet for the first time. Since these currently have "                     "Tablet for the first time. Since these currently have "
# Line 120  settings_t *settings_load(void) { Line 121  settings_t *settings_load(void) {
121                     "Map/No Icons at any time."));                     "Map/No Icons at any time."));
122    
123          settings->no_icons = TRUE;          settings->no_icons = TRUE;
124    #endif
125        }        }
126      }      }
127  #endif  #endif
# Line 229  settings_t *settings_load(void) { Line 231  settings_t *settings_load(void) {
231        }        }
232      }      }
233    
234  #if 1 // def USE_HILDON      /* use demo setup if present */
235      /* demo setup for maemo/hildon */      if(!settings->project) {
     {  
236        char *key = g_strdup_printf("/apps/" PACKAGE "/base_path");        char *key = g_strdup_printf("/apps/" PACKAGE "/base_path");
237        GConfValue *value = gconf_client_get(client, key, NULL);        GConfValue *value = gconf_client_get(client, key, NULL);
238        if(value)        if(value)
# Line 240  settings_t *settings_load(void) { Line 241  settings_t *settings_load(void) {
241          printf("base_path not set, assuming first time boot\n");          printf("base_path not set, assuming first time boot\n");
242    
243          /* check for presence of demo project */          /* check for presence of demo project */
244            if(project_exists(settings, "demo")) {
245              printf("demo project exists, use it as default\n");
246              settings->project = g_strdup("demo");
247              settings->first_run_demo = TRUE;
248            }
249        }        }
250      }      }
 #endif  
   
251    }    }
252    
253    
Legend:
Removed from v.178  
changed lines
  Added in v.179