[Xfce4-commits] <xfce4-weather-plugin:master> Use double_to_string where applicable.

[Harald Judt]

Updating branch refs/heads/master
         to 1659b9ba3893a50459f273a86d071ce7cdf410be (commit)
       from 751224afa3fd3be27c56d37c13c76af42100bcd4 (commit)

commit 1659b9ba3893a50459f273a86d071ce7cdf410be
Author: Harald Judt <h.judt at gmx.at>
Date:   Fri Dec 21 11:32:21 2012 +0100

    Use double_to_string where applicable.

 panel-plugin/weather-config.c |   30 ++++++++++++++++--------------
 panel-plugin/weather-data.c   |    5 +----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 5f6a420..701f8c5 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -269,29 +269,32 @@ static void
 lookup_altitude_timezone(const gpointer user_data)
 {
     xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
-    gchar *url, latbuf[10], lonbuf[10];
+    gchar *url, *latstr, *lonstr;
     gdouble lat, lon;
 
     lat = gtk_spin_button_get_value(GTK_SPIN_BUTTON(dialog->spin_lat));
     lon = gtk_spin_button_get_value(GTK_SPIN_BUTTON(dialog->spin_lon));
 
-    (void) g_ascii_formatd(latbuf, 10, "%.6f", lat);
-    (void) g_ascii_formatd(lonbuf, 10, "%.6f", lon);
+    latstr = double_to_string(lat, "%.6f");
+    lonstr = double_to_string(lon, "%.6f");
 
     /* lookup altitude */
     url = g_strdup_printf("http://api.geonames.org"
                           "/srtm3XML?lat=%s&lng=%s&username=%s",
-                          &latbuf[0], &lonbuf[0], GEONAMES_USERNAME);
+                          latstr, lonstr, GEONAMES_USERNAME);
     weather_http_queue_request(dialog->pd->session, url,
                                cb_lookup_altitude, user_data);
     g_free(url);
 
     /* lookup timezone */
     url = g_strdup_printf("http://www.earthtools.org/timezone/%s/%s",
-                          &latbuf[0], &lonbuf[0]);
+                          latstr, lonstr);
     weather_http_queue_request(dialog->pd->session, url,
                                cb_lookup_timezone, user_data);
     g_free(url);
+
+    g_free(lonstr);
+    g_free(latstr);
 }
 
 
@@ -350,24 +353,25 @@ cb_findlocation(GtkButton *button,
     xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
     search_dialog *sdialog;
     gchar *loc_name, *lat, *lon;
-    gchar latbuf[10], lonbuf[10];
 
     sdialog = create_search_dialog(NULL, dialog->pd->session);
 
     gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
     if (run_search_dialog(sdialog)) {
         /* limit digit precision of coordinates from search results */
-        lat = g_ascii_formatd(latbuf, 10, "%.6f",
-                              string_to_double(sdialog->result_lat, 0));
+        lat = double_to_string(string_to_double(sdialog->result_lat, 0),
+                               "%.6f");
         gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_lat),
                                   string_to_double(lat, 0));
-        lon = g_ascii_formatd(lonbuf, 10, "%.6f",
-                              string_to_double(sdialog->result_lon, 0));
+        lon = double_to_string(string_to_double(sdialog->result_lon, 0),
+                               "%.6f");
         gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_lon),
                                   string_to_double(lon, 0));
         loc_name = sanitize_location_name(sdialog->result_name);
         gtk_entry_set_text(GTK_ENTRY(dialog->text_loc_name), loc_name);
         g_free(loc_name);
+        g_free(lon);
+        g_free(lat);
     }
     free_search_dialog(sdialog);
 
@@ -426,12 +430,11 @@ spin_lat_value_changed(const GtkWidget *spin,
                        gpointer user_data)
 {
     xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
-    gchar latbuf[10];
     gdouble val;
 
     val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
     g_free(dialog->pd->lat);
-    dialog->pd->lat = g_strdup(g_ascii_formatd(latbuf, 10, "%.6f", val));
+    dialog->pd->lat = double_to_string(val, "%.6f");
     schedule_delayed_data_update(dialog);
 }
 
@@ -441,12 +444,11 @@ spin_lon_value_changed(const GtkWidget *spin,
                        gpointer user_data)
 {
     xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
-    gchar lonbuf[10];
     gdouble val;
 
     val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
     g_free(dialog->pd->lon);
-    dialog->pd->lon = g_strdup(g_ascii_formatd(lonbuf, 10, "%.6f", val));
+    dialog->pd->lon = double_to_string(val, "%.6f");
     schedule_delayed_data_update(dialog);
 }
 
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index 4c930ee..4869d09 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -515,7 +515,6 @@ interpolate_gchar_value(gchar *value_start,
                         time_t between_t,
                         gboolean radian)
 {
-    gchar value_result[10];
     gdouble val_start, val_end, val_result;
 
     if (G_UNLIKELY(value_end == NULL))
@@ -539,9 +538,7 @@ interpolate_gchar_value(gchar *value_start,
 
     weather_debug("Interpolated data: start=%f, end=%f, result=%f",
                   val_start, val_end, val_result);
-    (void) g_ascii_formatd(value_result, 10, "%.1f", val_result);
-
-    return g_strdup(value_result);
+    return double_to_string(val_result, "%.1f");
 }