diff options
| author | Bastien Nocera <hadess@hadess.net> | 2016-04-07 14:34:55 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2016-04-25 19:02:52 +0200 |
| commit | 9e0e0df63383154138a9206faf9babb91fcabceb (patch) | |
| tree | 642c624900e20941e1e95f3762fdbb300b1cc329 | |
| parent | dec3a13c65d2555c0476c501c391fc8a358cee93 (diff) | |
| download | gnome-control-center-9e0e0df63383154138a9206faf9babb91fcabceb.tar.gz | |
datetime: Fix "format not a string literal" error
https://bugzilla.gnome.org/show_bug.cgi?id=764727
| -rw-r--r-- | panels/datetime/cc-timezone-map.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/panels/datetime/cc-timezone-map.c b/panels/datetime/cc-timezone-map.c index 85567b20c..8b38c9e5b 100644 --- a/panels/datetime/cc-timezone-map.c +++ b/panels/datetime/cc-timezone-map.c @@ -372,7 +372,6 @@ cc_timezone_map_draw (GtkWidget *widget, GError *err = NULL; gdouble pointx, pointy; char buf[16]; - const char *fmt; gtk_widget_get_allocation (widget, &alloc); @@ -382,13 +381,19 @@ cc_timezone_map_draw (GtkWidget *widget, /* paint hilight */ if (gtk_widget_is_sensitive (widget)) - fmt = DATETIME_RESOURCE_PATH "/timezone_%s.png"; + { + file = g_strdup_printf (DATETIME_RESOURCE_PATH "/timezone_%s.png", + g_ascii_formatd (buf, sizeof (buf), + "%g", priv->selected_offset)); + } else - fmt = DATETIME_RESOURCE_PATH "/timezone_%s_dim.png"; + { + file = g_strdup_printf (DATETIME_RESOURCE_PATH "/timezone_%s_dim.png", + g_ascii_formatd (buf, sizeof (buf), + "%g", priv->selected_offset)); + + } - file = g_strdup_printf (fmt, - g_ascii_formatd (buf, sizeof (buf), - "%g", priv->selected_offset)); orig_hilight = gdk_pixbuf_new_from_resource (file, &err); g_free (file); file = NULL; |