Use helper functions. Change some ordering just for cosmetic reasons.

diff --git a/src/config-gconf.c b/src/config-gconf.c
index afcd1ec16625b7de22e78107ff5ac561649fd658..469a74c0754dc7baf9b74242ea5e16e16dd09268 100644 (file)
--- a/src/config-gconf.c
+++ b/src/config-gconf.c
@@ -451,12 +451,17 @@ return TRUE;
  * Initialize all configuration from GCONF.  This should not be called more
  * than once during execution.
  */
-void config_init(void)
+void
+config_init(void)
 {
 GConfValue *value;
 gchar *config_dir;
 gchar *str;
 gint i;
+CenterMode _center_mode = CENTER_LEAD;
+UnitType _units = UNITS_KM;
+guint _degformat = DDPDDDDD;
+InfoFontSize _info_font_size = INFO_FONT_MEDIUM;
 
 gconf_client=gconf_client_get_default();
 if (!gconf_client) {
@@ -467,11 +472,6 @@ if (!gconf_client) {
 /* Preload configuration */
 gconf_client_add_dir (gconf_client, GCONF_KEY_PREFIX, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
-CenterMode _center_mode = CENTER_LEAD;
-UnitType _units = UNITS_KM;
-guint _degformat = DDPDDDDD;
-InfoFontSize _info_font_size = INFO_FONT_MEDIUM;
-
 /* Initialize config_dir. */
 config_dir = gnome_vfs_expand_initial_tilde(CONFIG_DIR_NAME);
 g_mkdir_with_parents(config_dir, 0700);
@@ -495,19 +495,12 @@ _dest.valid=FALSE;
 _announce_notice_ratio=mapper_gconf_get_int(GCONF_KEY_ANNOUNCE_NOTICE, 8);
 
 /* Get Enable Voice flag.  Default is TRUE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_ENABLE_VOICE, NULL);
-if (value) {
-       _enable_voice = gconf_value_get_bool(value);
-       gconf_value_free(value);
-} else {
-       _enable_voice = TRUE;
-}
-
+_enable_voice=mapper_gconf_get_boolean(GCONF_KEY_ENABLE_VOICE, TRUE);
 _voice_pitch=mapper_gconf_get_bound_int(GCONF_KEY_VOICE_PITCH, 50, 10, 99);
 _voice_speed=mapper_gconf_get_bound_int(GCONF_KEY_VOICE_SPEED, 120, 80, 370);
 
 /* Get Always Keep On flag.  Default is FALSE. */
-_always_keep_on = gconf_client_get_bool(gconf_client,GCONF_KEY_ALWAYS_KEEP_ON, NULL);
+_always_keep_on =mapper_gconf_get_boolean(GCONF_KEY_ALWAYS_KEEP_ON, FALSE);
 
 filter.enabled = gconf_client_get_bool(gconf_client, GCONF_KEY_GPS_FILTER, NULL);
 filter.hdop = gconf_client_get_float(gconf_client, GCONF_KEY_GPS_FILTER_HDOP, NULL);
@@ -548,9 +541,7 @@ BOUND(filter.angle, 0, 45);
 
 /* Get Deg format.  Default is DDPDDDDD. */
 {
-       gchar *degformat_key_str = gconf_client_get_string(gconf_client,
-                                                          GCONF_KEY_DEG_FORMAT,
-                                                          NULL);
+       gchar *degformat_key_str = gconf_client_get_string(gconf_client, GCONF_KEY_DEG_FORMAT, NULL);
        guint i = 0;
        if (degformat_key_str)
                for (i = DEG_FORMAT_ENUM_COUNT - 1; i > 0; i--)
@@ -559,13 +550,6 @@ BOUND(filter.angle, 0, 45);
        _degformat = i;
 }
 
-/* Get Speed Limit On flag.  Default is FALSE. */
-_speed_on = gconf_client_get_bool(gconf_client, GCONF_KEY_SPEED_LIMIT_ON, NULL);
-
-/* Get Speed Limit */
-_speed_limit = gconf_client_get_int(gconf_client, GCONF_KEY_SPEED_LIMIT, NULL);
-BOUND(_speed_limit, 1, 200);
-
 /* Get Info Font Size.  Default is INFO_FONT_MEDIUM. */
 {
        gchar *info_font_size_str = gconf_client_get_string(gconf_client, GCONF_KEY_INFO_FONT_SIZE, NULL);
@@ -579,14 +563,19 @@ BOUND(_speed_limit, 1, 200);
        _info_font_size = i;
 }
 
+/* Get Speed Limit On flag.  Default is FALSE. */
+_speed_on = gconf_client_get_bool(gconf_client, GCONF_KEY_SPEED_LIMIT_ON, NULL);
+
+/* Get Speed Limit */
+_speed_limit = gconf_client_get_int(gconf_client, GCONF_KEY_SPEED_LIMIT, NULL);
+BOUND(_speed_limit, 1, 200);
+
 /* Get Auto-Download.  Default is FALSE. */
-_auto_download = gconf_client_get_bool(gconf_client, GCONF_KEY_AUTO_DOWNLOAD, NULL);
+_auto_download=mapper_gconf_get_boolean(GCONF_KEY_AUTO_DOWNLOAD, FALSE);
 
 /* Get saved location */
-_gps->data.lat = gconf_client_get_float(gconf_client, GCONF_KEY_LAT, NULL);
-_gps->data.lon = gconf_client_get_float(gconf_client, GCONF_KEY_LON, NULL);
-if (_gps->data.lat==0.0) _gps->data.lat=60.20;
-if (_gps->data.lon==0.0) _gps->data.lon=22.20;
+_gps->data.lat=mapper_gconf_get_float(GCONF_KEY_LAT, 60.20);
+_gps->data.lon=mapper_gconf_get_float(GCONF_KEY_LON, 22.20);
 
 /* Home */
 _home.valid=TRUE;
@@ -660,82 +649,32 @@ _track_file_uri = gconf_client_get_string(gconf_client, GCONF_KEY_TRACKFILE, NUL
 _center_mode=mapper_gconf_get_int(GCONF_KEY_AUTOCENTER_MODE, CENTER_LEAD);
 
 /* Get Show Scale flag.  Default is TRUE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_SHOWSCALE, NULL);
-if (value) {
-       _show_scale = gconf_value_get_bool(value);
-       gconf_value_free(value);
-} else {
-       _show_scale = TRUE;
-}
+_show_scale=mapper_gconf_get_boolean(GCONF_KEY_SHOWSCALE, TRUE);
 
 /* Get Show Tracks flag.  Default is TRUE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_SHOWTRACKS, NULL);
-if (value) {
-       _show_tracks |= (gconf_value_get_bool(value) ? TRACKS_MASK : 0);
-       gconf_value_free(value);
-} else {
-       _show_tracks |= TRACKS_MASK;
-}
+_show_tracks |= mapper_gconf_get_boolean(GCONF_KEY_SHOWTRACKS, TRUE) ? TRACKS_MASK : 0;
 
 /* Get Show Routes flag.  Default is TRUE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_SHOWROUTES, NULL);
-if (value) {
-       _show_tracks |= (gconf_value_get_bool(value) ? ROUTES_MASK : 0);
-       gconf_value_free(value);
-} else {
-       _show_tracks |= ROUTES_MASK;
-}
+_show_tracks |= mapper_gconf_get_boolean(GCONF_KEY_SHOWROUTES, TRUE) ? ROUTES_MASK : 0;
 
 /* Get Show Velocity Vector flag.  Default is TRUE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_SHOWVELVEC, NULL);
-if (value) {
-       _show_velvec = gconf_value_get_bool(value);
-       gconf_value_free(value);
-} else {
-       _show_velvec = TRUE;
-}
+_show_velvec=mapper_gconf_get_boolean(GCONF_KEY_SHOWVELVEC, TRUE);
 
-/* Get Show Velocity Vector flag.  Default is TRUE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_SHOWPOIS, NULL);
-if (value) {
-       _show_poi = gconf_value_get_bool(value);
-       gconf_value_free(value);
-} else {
-       _show_poi = TRUE;
-}
+_show_poi=mapper_gconf_get_boolean(GCONF_KEY_SHOWPOIS, TRUE);
 
 /* Get Enable GPS flag. Default is FALSE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_ENABLE_GPS, NULL);
-if (value) {
-       _enable_gps = gconf_value_get_bool(value);
-       gconf_value_free(value);
-} else {
-       _enable_gps = FALSE;
-}
+_enable_gps=mapper_gconf_get_boolean(GCONF_KEY_ENABLE_GPS, FALSE);
 
 /* Initialize _conn_state based on _enable_gps-> */
 _gps->io.conn = (_enable_gps ? RCVR_DOWN : RCVR_OFF);
 
 config_load_string_list(GCONF_KEY_ROUTE_LOCATIONS, &_loc_list, &_loc_model);
 
-/* Get Mapper Database. Default is in REPO_DEFAULT_CACHE_BASE */
-_mapper_db = gconf_client_get_string(gconf_client, GCONF_KEY_MAPPER_DB, NULL);
-if (_mapper_db == NULL) {
-       gchar *db_base = gnome_vfs_expand_initial_tilde(REPO_DEFAULT_CACHE_BASE);
-       _mapper_db = gnome_vfs_uri_make_full_from_relative(db_base, "mapper.db");
-       g_free(db_base);
-}
-
+/* Show POIs below zoom */
 _poi_zoom = mapper_gconf_get_int(GCONF_KEY_POI_ZOOM, 6);
 
 /* Get GPS Info flag. Default is FALSE. */
-value = gconf_client_get(gconf_client, GCONF_KEY_GPS_INFO, NULL);
-if (value) {
-       _gps_info = gconf_value_get_bool(value);
-       gconf_value_free(value);
-} else {
-       _gps_info = FALSE;
-}
+_gps_info=mapper_gconf_get_boolean(GCONF_KEY_GPS_INFO, FALSE);
 
 /* Get Route Download URL. Default is:
  * "http://www.gnuite.com/cgi-bin/gpx.cgi?saddr=%s&daddr=%s" */
@@ -754,6 +693,14 @@ for (i = 0; i < COLORABLE_ENUM_COUNT; i++) {
                _color[i] = COLORABLE_DEFAULT[i];
 }
 
+/* Get Mapper Database. Default is in REPO_DEFAULT_CACHE_BASE */
+_mapper_db = gconf_client_get_string(gconf_client, GCONF_KEY_MAPPER_DB, NULL);
+if (_mapper_db == NULL) {
+       gchar *db_base = gnome_vfs_expand_initial_tilde(REPO_DEFAULT_CACHE_BASE);
+       _mapper_db = gnome_vfs_uri_make_full_from_relative(db_base, "mapper.db");
+       g_free(db_base);
+}
+
 /* Get current proxy settings. */
 config_update_proxy();