summaryrefslogtreecommitdiff
path: root/applets/clock/clock-location.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-10-11 00:04:50 +0200
committerStefano Karapetsas <[email protected]>2012-10-11 00:04:50 +0200
commitcf41dc3d28c3daa30f04962718b468cf46830828 (patch)
treebf34cb5d73dbc4d297229b1464967ace652e7085 /applets/clock/clock-location.c
parent5052d39d3d10a57b2fe0e15b2e7833ef207d3a48 (diff)
downloadmate-panel-cf41dc3d28c3daa30f04962718b468cf46830828.tar.bz2
mate-panel-cf41dc3d28c3daa30f04962718b468cf46830828.tar.xz
migrate clock applet to gsettings
remove evolution code
Diffstat (limited to 'applets/clock/clock-location.c')
-rw-r--r--applets/clock/clock-location.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c
index 1b81c517..efbc5939 100644
--- a/applets/clock/clock-location.c
+++ b/applets/clock/clock-location.c
@@ -676,8 +676,12 @@ update_weather_info (gpointer data)
DISTANCE_UNIT_KM
};
- prefs.temperature_unit = priv->temperature_unit;
- prefs.speed_unit = priv->speed_unit;
+ // set temperature and speed units only if different from
+ // invalid/default
+ if (priv->temperature_unit > TEMP_UNIT_DEFAULT)
+ prefs.temperature_unit = priv->temperature_unit;
+ if (priv->speed_unit > SPEED_UNIT_DEFAULT)
+ prefs.speed_unit = priv->speed_unit;
weather_info_abort (priv->weather_info);
weather_info_update (priv->weather_info,