[gnome-panel] clock: fix implicit conversion warnings
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] clock: fix implicit conversion warnings
- Date: Thu, 11 Jan 2018 17:41:26 +0000 (UTC)
commit b45d6f4a6bfeed8c17407cad634e9aa7b8506937
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Thu Jan 11 19:24:57 2018 +0200
clock: fix implicit conversion warnings
modules/clock/clock-applet.c | 14 ++++++++------
modules/clock/clock-map.c | 5 ++++-
2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/modules/clock/clock-applet.c b/modules/clock/clock-applet.c
index 68aa969..57c7b75 100644
--- a/modules/clock/clock-applet.c
+++ b/modules/clock/clock-applet.c
@@ -1352,11 +1352,13 @@ run_prefs_edit_save (GtkButton *button,
}
static void
-update_coords_helper (gfloat value, GtkWidget *entry, GtkWidget *combo)
+update_coords_helper (gdouble value,
+ GtkWidget *entry,
+ GtkWidget *combo)
{
gchar *tmp;
- tmp = g_strdup_printf ("%f", fabsf (value));
+ tmp = g_strdup_printf ("%f", fabs (value));
gtk_entry_set_text (GTK_ENTRY (entry), tmp);
g_free (tmp);
@@ -1370,8 +1372,8 @@ update_coords_helper (gfloat value, GtkWidget *entry, GtkWidget *combo)
static void
update_coords (ClockApplet *cd,
gboolean valid,
- gfloat lat,
- gfloat lon)
+ gdouble lat,
+ gdouble lon)
{
GtkWidget *lat_entry = _clock_get_widget (cd, "edit-location-latitude-entry");
GtkWidget *lon_entry = _clock_get_widget (cd, "edit-location-longitude-entry");
@@ -1665,7 +1667,7 @@ edit_tree_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpoint
fill_timezone_combo_from_location (cd, loc);
- tmp = g_strdup_printf ("%f", fabsf(lat));
+ tmp = g_strdup_printf ("%f", fabs (lat));
gtk_entry_set_text (GTK_ENTRY (lat_entry), tmp);
g_free (tmp);
@@ -1675,7 +1677,7 @@ edit_tree_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpoint
gtk_combo_box_set_active (GTK_COMBO_BOX (lat_combo), 1);
}
- tmp = g_strdup_printf ("%f", fabsf(lon));
+ tmp = g_strdup_printf ("%f", fabs (lon));
gtk_entry_set_text (GTK_ENTRY (lon_entry), tmp);
g_free (tmp);
diff --git a/modules/clock/clock-map.c b/modules/clock/clock-map.c
index 247949e..47d7989 100644
--- a/modules/clock/clock-map.c
+++ b/modules/clock/clock-map.c
@@ -458,7 +458,10 @@ clock_map_size_allocate (GtkWidget *this, GtkAllocation *allocation)
}
static void
-clock_map_mark (ClockMap *this, gfloat latitude, gfloat longitude, gint mark)
+clock_map_mark (ClockMap *this,
+ gdouble latitude,
+ gdouble longitude,
+ gint mark)
{
ClockMapPrivate *priv = PRIVATE (this);
GdkPixbuf *marker = priv->location_marker_pixbuf[mark];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]