[gnome-initial-setup] timezone: Sync cc-timezone-map with gnome-control-center



commit 304ee7deb08841bea17c1b28de0e88f72aff10ef
Author: Kalev Lember <klember redhat com>
Date:   Mon Sep 5 11:09:02 2016 +0200

    timezone: Sync cc-timezone-map with gnome-control-center

 .../pages/timezone/cc-timezone-map.c               |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/gnome-initial-setup/pages/timezone/cc-timezone-map.c 
b/gnome-initial-setup/pages/timezone/cc-timezone-map.c
index 85567b2..8b38c9e 100644
--- a/gnome-initial-setup/pages/timezone/cc-timezone-map.c
+++ b/gnome-initial-setup/pages/timezone/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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]