merge lp:~ted/indicator-datetime/lp773987 to switch the parsing of the lat and long to be non-locale based as it's returned from the webservice in C, we want to parse it using the decimal instead of a comma.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/datetime-prefs-locations.c b/src/datetime-prefs-locations.c
index c0452d0..9f5b42c 100644
--- a/src/datetime-prefs-locations.c
+++ b/src/datetime-prefs-locations.c
@@ -201,8 +201,8 @@ timezone_selected (GtkEntryCompletion * widget, GtkTreeModel * model,
                         CC_TIMEZONE_COMPLETION_LONGITUDE, &strlon,
                         -1);
 
-    if (strlat && *strlat) lat = atof(strlat);
-    if (strlon && *strlon) lon = atof(strlon);
+    if (strlat && *strlat) lat = g_ascii_strtod(strlat, NULL);
+    if (strlon && *strlon) lon = g_ascii_strtod(strlon, NULL);
 
     CcTimezoneMap * tzmap = CC_TIMEZONE_MAP (g_object_get_data (G_OBJECT (widget), "tzmap"));
     g_free (zone);
diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c
index 615d601..611d9ef 100644
--- a/src/datetime-prefs.c
+++ b/src/datetime-prefs.c
@@ -613,11 +613,11 @@ timezone_selected (GtkEntryCompletion * widget, GtkTreeModel * model,
                         -1);
 
     if (strlon != NULL && strlon[0] != 0) {
-      lon = strtod(strlon, NULL);
+      lon = g_ascii_strtod(strlon, NULL);
     }
 
     if (strlat != NULL && strlat[0] != 0) {
-      lat = strtod(strlat, NULL);
+      lat = g_ascii_strtod(strlat, NULL);
     }
 
     zone = cc_timezone_map_get_timezone_at_coords (self->priv->tzmap, lon, lat);