[gnome-initial-setup/static-linking: 2/3] location: Import data files for timezone and use gresource

[Jasper St. Pierre <jstpierre src gnome org>]

commit 9981456cbe1b64edfd3778f8de114a2b8daa4970
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Jan 15 18:54:09 2013 -0500

    location: Import data files for timezone and use gresource
    
    As gnome-control-center doesn't ship the resource files anymore,
    we need to ship these as well. I'm working with the Ubuntu team
    on having a libtimezonemap upstream, as a submodule or static
    library.

 .gitignore                                         |    1 +
 gnome-initial-setup/pages/location/Makefile.am     |   15 ++-
 .../pages/location/cc-timezone-map.c               |  103 +++++++++++++++-----
 .../pages/location/cc-timezone-map.h               |   11 +-
 gnome-initial-setup/pages/location/data/bg.png     |  Bin 0 -> 213448 bytes
 gnome-initial-setup/pages/location/data/bg_dim.png |  Bin 0 -> 95862 bytes
 gnome-initial-setup/pages/location/data/cc.png     |  Bin 0 -> 52271 bytes
 gnome-initial-setup/pages/location/data/pin.png    |  Bin 0 -> 561 bytes
 .../pages/location/data/timezone_-1.png            |  Bin 0 -> 8012 bytes
 .../pages/location/data/timezone_-10.png           |  Bin 0 -> 7783 bytes
 .../pages/location/data/timezone_-10_dim.png       |  Bin 0 -> 5139 bytes
 .../pages/location/data/timezone_-11.png           |  Bin 0 -> 8347 bytes
 .../pages/location/data/timezone_-11_dim.png       |  Bin 0 -> 4815 bytes
 .../pages/location/data/timezone_-1_dim.png        |  Bin 0 -> 4953 bytes
 .../pages/location/data/timezone_-2.png            |  Bin 0 -> 4333 bytes
 .../pages/location/data/timezone_-2_dim.png        |  Bin 0 -> 2670 bytes
 .../pages/location/data/timezone_-3.5.png          |  Bin 0 -> 740 bytes
 .../pages/location/data/timezone_-3.5_dim.png      |  Bin 0 -> 995 bytes
 .../pages/location/data/timezone_-3.png            |  Bin 0 -> 13615 bytes
 .../pages/location/data/timezone_-3_dim.png        |  Bin 0 -> 8773 bytes
 .../pages/location/data/timezone_-4.5.png          |  Bin 0 -> 1900 bytes
 .../pages/location/data/timezone_-4.5_dim.png      |  Bin 0 -> 1527 bytes
 .../pages/location/data/timezone_-4.png            |  Bin 0 -> 15084 bytes
 .../pages/location/data/timezone_-4_dim.png        |  Bin 0 -> 9836 bytes
 .../pages/location/data/timezone_-5.5.png          |  Bin 0 -> 437 bytes
 .../pages/location/data/timezone_-5.5_dim.png      |  Bin 0 -> 859 bytes
 .../pages/location/data/timezone_-5.png            |  Bin 0 -> 19166 bytes
 .../pages/location/data/timezone_-5_dim.png        |  Bin 0 -> 12224 bytes
 .../pages/location/data/timezone_-6.png            |  Bin 0 -> 13764 bytes
 .../pages/location/data/timezone_-6_dim.png        |  Bin 0 -> 8833 bytes
 .../pages/location/data/timezone_-7.png            |  Bin 0 -> 11977 bytes
 .../pages/location/data/timezone_-7_dim.png        |  Bin 0 -> 7868 bytes
 .../pages/location/data/timezone_-8.png            |  Bin 0 -> 6801 bytes
 .../pages/location/data/timezone_-8_dim.png        |  Bin 0 -> 4261 bytes
 .../pages/location/data/timezone_-9.5.png          |  Bin 0 -> 437 bytes
 .../pages/location/data/timezone_-9.5_dim.png      |  Bin 0 -> 859 bytes
 .../pages/location/data/timezone_-9.png            |  Bin 0 -> 7908 bytes
 .../pages/location/data/timezone_-9_dim.png        |  Bin 0 -> 4972 bytes
 .../pages/location/data/timezone_0.png             |  Bin 0 -> 11074 bytes
 .../pages/location/data/timezone_0_dim.png         |  Bin 0 -> 7074 bytes
 .../pages/location/data/timezone_1.png             |  Bin 0 -> 15458 bytes
 .../pages/location/data/timezone_10.5.png          |  Bin 0 -> 421 bytes
 .../pages/location/data/timezone_10.5_dim.png      |  Bin 0 -> 844 bytes
 .../pages/location/data/timezone_10.png            |  Bin 0 -> 12829 bytes
 .../pages/location/data/timezone_10_dim.png        |  Bin 0 -> 8395 bytes
 .../pages/location/data/timezone_11.5.png          |  Bin 0 -> 446 bytes
 .../pages/location/data/timezone_11.5_dim.png      |  Bin 0 -> 868 bytes
 .../pages/location/data/timezone_11.png            |  Bin 0 -> 12113 bytes
 .../pages/location/data/timezone_11_dim.png        |  Bin 0 -> 6744 bytes
 .../pages/location/data/timezone_12.75.png         |  Bin 0 -> 409 bytes
 .../pages/location/data/timezone_12.75_dim.png     |  Bin 0 -> 846 bytes
 .../pages/location/data/timezone_12.png            |  Bin 0 -> 7130 bytes
 .../pages/location/data/timezone_12_dim.png        |  Bin 0 -> 3935 bytes
 .../pages/location/data/timezone_13.png            |  Bin 0 -> 621 bytes
 .../pages/location/data/timezone_13_dim.png        |  Bin 0 -> 876 bytes
 .../pages/location/data/timezone_14.png            |  Bin 0 -> 7722 bytes
 .../pages/location/data/timezone_14_dim.png        |  Bin 0 -> 4150 bytes
 .../pages/location/data/timezone_1_dim.png         |  Bin 0 -> 10187 bytes
 .../pages/location/data/timezone_2.png             |  Bin 0 -> 12854 bytes
 .../pages/location/data/timezone_2_dim.png         |  Bin 0 -> 8709 bytes
 .../pages/location/data/timezone_3.5.png           |  Bin 0 -> 2142 bytes
 .../pages/location/data/timezone_3.5_dim.png       |  Bin 0 -> 1781 bytes
 .../pages/location/data/timezone_3.png             |  Bin 0 -> 17475 bytes
 .../pages/location/data/timezone_3_dim.png         |  Bin 0 -> 9877 bytes
 .../pages/location/data/timezone_4.5.png           |  Bin 0 -> 1773 bytes
 .../pages/location/data/timezone_4.5_dim.png       |  Bin 0 -> 1385 bytes
 .../pages/location/data/timezone_4.png             |  Bin 0 -> 4954 bytes
 .../pages/location/data/timezone_4_dim.png         |  Bin 0 -> 2754 bytes
 .../pages/location/data/timezone_5.5.png           |  Bin 0 -> 6099 bytes
 .../pages/location/data/timezone_5.5_dim.png       |  Bin 0 -> 3405 bytes
 .../pages/location/data/timezone_5.75.png          |  Bin 0 -> 2885 bytes
 .../pages/location/data/timezone_5.75_dim.png      |  Bin 0 -> 1596 bytes
 .../pages/location/data/timezone_5.png             |  Bin 0 -> 14539 bytes
 .../pages/location/data/timezone_5_dim.png         |  Bin 0 -> 8117 bytes
 .../pages/location/data/timezone_6.5.png           |  Bin 0 -> 1609 bytes
 .../pages/location/data/timezone_6.5_dim.png       |  Bin 0 -> 1675 bytes
 .../pages/location/data/timezone_6.png             |  Bin 0 -> 8441 bytes
 .../pages/location/data/timezone_6_dim.png         |  Bin 0 -> 4678 bytes
 .../pages/location/data/timezone_7.png             |  Bin 0 -> 14412 bytes
 .../pages/location/data/timezone_7_dim.png         |  Bin 0 -> 7972 bytes
 .../pages/location/data/timezone_8.75.png          |  Bin 0 -> 13993 bytes
 .../pages/location/data/timezone_8.75_dim.png      |  Bin 0 -> 7064 bytes
 .../pages/location/data/timezone_8.png             |  Bin 0 -> 16050 bytes
 .../pages/location/data/timezone_8_dim.png         |  Bin 0 -> 9378 bytes
 .../pages/location/data/timezone_9.5.png           |  Bin 0 -> 1959 bytes
 .../pages/location/data/timezone_9.5_dim.png       |  Bin 0 -> 1611 bytes
 .../pages/location/data/timezone_9.png             |  Bin 0 -> 12608 bytes
 .../pages/location/data/timezone_9_dim.png         |  Bin 0 -> 8383 bytes
 .../pages/location/datetime.gresource.xml          |   89 +++++++++++++++++
 gnome-initial-setup/pages/location/tz.c            |   22 +++--
 gnome-initial-setup/pages/location/tz.h            |   11 +-
 91 files changed, 202 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3d8529..dc73730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ gnome-initial-setup/pages/account/um-realm-generated.c
 gnome-initial-setup/pages/account/um-realm-generated.h
 gnome-initial-setup/pages/location/timedated.c
 gnome-initial-setup/pages/location/timedated.h
+gnome-initial-setup/pages/location/cc-datetime-resources.c
 gnome-initial-setup/pages/language/languages/list-languages
 
 gnome-initial-setup.desktop
diff --git a/gnome-initial-setup/pages/location/Makefile.am b/gnome-initial-setup/pages/location/Makefile.am
index c0e7370..f4d82cf 100644
--- a/gnome-initial-setup/pages/location/Makefile.am
+++ b/gnome-initial-setup/pages/location/Makefile.am
@@ -4,14 +4,12 @@ noinst_LTLIBRARIES = libgislocation.la
 BUILT_SOURCES =
 
 # GNOMECC_DATA_DIR is used in tz.c
-# DATADIR is used in cc-timezone-map.c
 # these two files are copied from gnome-control-center,
 # which explains the slightly odd locations
 
 # XXX -- move to libtimezonemap at some point
 AM_CPPFLAGS = \
-	-DGNOMECC_DATA_DIR="\"$(datadir)/gnome-control-center\"" \
-	-DDATADIR="\"$(datadir)/gnome-control-center/ui/datetime\""
+	-DGNOMECC_DATA_DIR="\"$(datadir)/gnome-control-center\""
 
 timedated.c: timedated.h
 timedated.h: $(srcdir)/timedated1-interface.xml
@@ -20,6 +18,11 @@ timedated.h: $(srcdir)/timedated1-interface.xml
 		--generate-c-code timedated $<
 BUILT_SOURCES += timedated.c timedated.h
 
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/datetime.gresource.xml)
+cc-datetime-resources.c: datetime.gresource.xml $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+BUILT_SOURCES += cc-datetime-resources.c
+
 libgislocation_la_SOURCES =	\
 	tz.c tz.h \
 	cc-timezone-map.c cc-timezone-map.h \
@@ -30,5 +33,7 @@ libgislocation_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.."
 libgislocation_la_LIBADD = $(INITIAL_SETUP_LIBS)
 libgislocation_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
 
-EXTRA_DIST = 	\
-	timedated1-interface.xml
+EXTRA_DIST =				\
+	timedated1-interface.xml	\
+	$(resource_files)		\
+	datetime.gresource.xml
diff --git a/gnome-initial-setup/pages/location/cc-timezone-map.c b/gnome-initial-setup/pages/location/cc-timezone-map.c
index f49b29d..3e127b0 100644
--- a/gnome-initial-setup/pages/location/cc-timezone-map.c
+++ b/gnome-initial-setup/pages/location/cc-timezone-map.c
@@ -4,10 +4,10 @@
  * Portions from Ubiquity, Copyright (C) 2009 Canonical Ltd.
  * Written by Evan Dandrea <evand ubuntu com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Author: Thomas Wood <thomas wood intel com>
  *
@@ -33,6 +32,10 @@ G_DEFINE_TYPE (CcTimezoneMap, cc_timezone_map, GTK_TYPE_WIDGET)
 #define TIMEZONE_MAP_PRIVATE(o) \
   (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_TIMEZONE_MAP, CcTimezoneMapPrivate))
 
+#define PIN_HOT_POINT_X 8
+#define PIN_HOT_POINT_Y 14
+
+#define DATETIME_RESOURCE_PATH "/org/gnome/control-center/datetime"
 
 typedef struct
 {
@@ -46,6 +49,7 @@ typedef struct
 struct _CcTimezoneMapPrivate
 {
   GdkPixbuf *orig_background;
+  GdkPixbuf *orig_background_dim;
   GdkPixbuf *orig_color_map;
 
   GdkPixbuf *background;
@@ -144,11 +148,8 @@ cc_timezone_map_dispose (GObject *object)
 {
   CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (object)->priv;
 
-  if (priv->orig_background)
-    {
-      g_object_unref (priv->orig_background);
-      priv->orig_background = NULL;
-    }
+  g_clear_object (&priv->orig_background);
+  g_clear_object (&priv->orig_background_dim);
 
   if (priv->orig_color_map)
     {
@@ -227,11 +228,17 @@ cc_timezone_map_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv;
+  GdkPixbuf *pixbuf;
 
   if (priv->background)
     g_object_unref (priv->background);
 
-  priv->background = gdk_pixbuf_scale_simple (priv->orig_background,
+  if (!gtk_widget_is_sensitive (widget))
+    pixbuf = priv->orig_background_dim;
+  else
+    pixbuf = priv->orig_background;
+
+  priv->background = gdk_pixbuf_scale_simple (pixbuf,
                                               allocation->width,
                                               allocation->height,
                                               GDK_INTERP_BILINEAR);
@@ -256,7 +263,6 @@ cc_timezone_map_realize (GtkWidget *widget)
 {
   GdkWindowAttr attr = { 0, };
   GtkAllocation allocation;
-  GdkCursor *cursor;
   GdkWindow *window;
 
   gtk_widget_get_allocation (widget, &allocation);
@@ -275,9 +281,6 @@ cc_timezone_map_realize (GtkWidget *widget)
   window = gdk_window_new (gtk_widget_get_parent_window (widget), &attr,
                            GDK_WA_X | GDK_WA_Y);
 
-  cursor = gdk_cursor_new (GDK_HAND2);
-  gdk_window_set_cursor (window, cursor);
-
   gdk_window_set_user_data (window, widget);
   gtk_widget_set_window (widget, window);
 }
@@ -331,6 +334,7 @@ cc_timezone_map_draw (GtkWidget *widget,
   GError *err = NULL;
   gdouble pointx, pointy;
   char buf[16];
+  const char *fmt;
 
   gtk_widget_get_allocation (widget, &alloc);
 
@@ -339,10 +343,15 @@ cc_timezone_map_draw (GtkWidget *widget,
   cairo_paint (cr);
 
   /* paint hilight */
-  file = g_strdup_printf (DATADIR "/timezone_%s.png",
+  if (gtk_widget_is_sensitive (widget))
+    fmt = DATETIME_RESOURCE_PATH "/timezone_%s.png";
+  else
+    fmt = DATETIME_RESOURCE_PATH "/timezone_%s_dim.png";
+
+  file = g_strdup_printf (fmt,
                           g_ascii_formatd (buf, sizeof (buf),
                                            "%g", priv->selected_offset));
-  orig_hilight = gdk_pixbuf_new_from_file (file, &err);
+  orig_hilight = gdk_pixbuf_new_from_resource (file, &err);
   g_free (file);
   file = NULL;
 
@@ -366,7 +375,7 @@ cc_timezone_map_draw (GtkWidget *widget,
     }
 
   /* load pin icon */
-  pin = gdk_pixbuf_new_from_file (DATADIR "/pin.png", &err);
+  pin = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/pin.png", &err);
 
   if (err)
     {
@@ -384,7 +393,7 @@ cc_timezone_map_draw (GtkWidget *widget,
 
       if (pin)
         {
-          gdk_cairo_set_source_pixbuf (cr, pin, pointx - 8, pointy - 14);
+          gdk_cairo_set_source_pixbuf (cr, pin, pointx - PIN_HOT_POINT_X, pointy - PIN_HOT_POINT_Y);
           cairo_paint (cr);
         }
     }
@@ -397,6 +406,39 @@ cc_timezone_map_draw (GtkWidget *widget,
   return TRUE;
 }
 
+static void
+update_cursor (GtkWidget *widget)
+{
+  GdkWindow *window;
+  GdkCursor *cursor = NULL;
+
+  if (!gtk_widget_get_realized (widget))
+    return;
+
+  if (gtk_widget_is_sensitive (widget))
+    {
+      GdkDisplay *display;
+      display = gtk_widget_get_display (widget);
+      cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
+    }
+
+  window = gtk_widget_get_window (widget);
+  gdk_window_set_cursor (window, cursor);
+
+  if (cursor)
+    g_object_unref (cursor);
+}
+
+static void
+cc_timezone_map_state_flags_changed (GtkWidget     *widget,
+                                     GtkStateFlags  prev_state)
+{
+  update_cursor (widget);
+
+  if (GTK_WIDGET_CLASS (cc_timezone_map_parent_class)->state_flags_changed)
+    GTK_WIDGET_CLASS (cc_timezone_map_parent_class)->state_flags_changed (widget, prev_state);
+}
+
 
 static void
 cc_timezone_map_class_init (CcTimezoneMapClass *klass)
@@ -416,6 +458,7 @@ cc_timezone_map_class_init (CcTimezoneMapClass *klass)
   widget_class->size_allocate = cc_timezone_map_size_allocate;
   widget_class->realize = cc_timezone_map_realize;
   widget_class->draw = cc_timezone_map_draw;
+  widget_class->state_flags_changed = cc_timezone_map_state_flags_changed;
 
   signals[LOCATION_CHANGED] = g_signal_new ("location-changed",
                                             CC_TYPE_TIMEZONE_MAP,
@@ -470,7 +513,7 @@ button_press_event (GtkWidget      *widget,
   guchar r, g, b, a;
   guchar *pixels;
   gint rowstride;
-  gsize i;
+  gint i;
 
   const GPtrArray *array;
   gint width, height;
@@ -542,8 +585,8 @@ cc_timezone_map_init (CcTimezoneMap *self)
 
   priv = self->priv = TIMEZONE_MAP_PRIVATE (self);
 
-  priv->orig_background = gdk_pixbuf_new_from_file (DATADIR "/bg.png",
-                                                    &err);
+  priv->orig_background = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/bg.png",
+                                                        &err);
 
   if (!priv->orig_background)
     {
@@ -552,8 +595,18 @@ cc_timezone_map_init (CcTimezoneMap *self)
       g_clear_error (&err);
     }
 
-  priv->orig_color_map = gdk_pixbuf_new_from_file (DATADIR "/cc.png",
-                                                   &err);
+  priv->orig_background_dim = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/bg_dim.png",
+                                                            &err);
+
+  if (!priv->orig_background_dim)
+    {
+      g_warning ("Could not load background image: %s",
+                 (err) ? err->message : "Unknown error");
+      g_clear_error (&err);
+    }
+
+  priv->orig_color_map = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/cc.png",
+                                                       &err);
   if (!priv->orig_color_map)
     {
       g_warning ("Could not load background image: %s",
diff --git a/gnome-initial-setup/pages/location/cc-timezone-map.h b/gnome-initial-setup/pages/location/cc-timezone-map.h
index 629b6eb..bb15def 100644
--- a/gnome-initial-setup/pages/location/cc-timezone-map.h
+++ b/gnome-initial-setup/pages/location/cc-timezone-map.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2010 Intel, Inc
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Author: Thomas Wood <thomas wood intel com>
  *
diff --git a/gnome-initial-setup/pages/location/data/bg.png b/gnome-initial-setup/pages/location/data/bg.png
new file mode 100644
index 0000000..4180ee8
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/bg.png differ
diff --git a/gnome-initial-setup/pages/location/data/bg_dim.png b/gnome-initial-setup/pages/location/data/bg_dim.png
new file mode 100644
index 0000000..3d34b94
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/bg_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/cc.png b/gnome-initial-setup/pages/location/data/cc.png
new file mode 100644
index 0000000..9984d23
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/cc.png differ
diff --git a/gnome-initial-setup/pages/location/data/pin.png b/gnome-initial-setup/pages/location/data/pin.png
new file mode 100644
index 0000000..599a751
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/pin.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-1.png b/gnome-initial-setup/pages/location/data/timezone_-1.png
new file mode 100644
index 0000000..fb00d83
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-1.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-10.png b/gnome-initial-setup/pages/location/data/timezone_-10.png
new file mode 100644
index 0000000..472eb88
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-10.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-10_dim.png b/gnome-initial-setup/pages/location/data/timezone_-10_dim.png
new file mode 100644
index 0000000..7dd94f4
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-10_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-11.png b/gnome-initial-setup/pages/location/data/timezone_-11.png
new file mode 100644
index 0000000..1da3536
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-11.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-11_dim.png b/gnome-initial-setup/pages/location/data/timezone_-11_dim.png
new file mode 100644
index 0000000..3ed7bb4
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-11_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-1_dim.png b/gnome-initial-setup/pages/location/data/timezone_-1_dim.png
new file mode 100644
index 0000000..5a1fd9f
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-1_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-2.png b/gnome-initial-setup/pages/location/data/timezone_-2.png
new file mode 100644
index 0000000..30a1ec7
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-2.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-2_dim.png b/gnome-initial-setup/pages/location/data/timezone_-2_dim.png
new file mode 100644
index 0000000..da78e75
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-2_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-3.5.png b/gnome-initial-setup/pages/location/data/timezone_-3.5.png
new file mode 100644
index 0000000..c1df00b
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-3.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-3.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_-3.5_dim.png
new file mode 100644
index 0000000..a72375c
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-3.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-3.png b/gnome-initial-setup/pages/location/data/timezone_-3.png
new file mode 100644
index 0000000..c22dbb6
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-3.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-3_dim.png b/gnome-initial-setup/pages/location/data/timezone_-3_dim.png
new file mode 100644
index 0000000..be9e495
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-3_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-4.5.png b/gnome-initial-setup/pages/location/data/timezone_-4.5.png
new file mode 100644
index 0000000..9e3c134
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-4.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-4.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_-4.5_dim.png
new file mode 100644
index 0000000..02d0f3b
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-4.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-4.png b/gnome-initial-setup/pages/location/data/timezone_-4.png
new file mode 100644
index 0000000..4b5a431
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-4.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-4_dim.png b/gnome-initial-setup/pages/location/data/timezone_-4_dim.png
new file mode 100644
index 0000000..809ddf0
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-4_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-5.5.png b/gnome-initial-setup/pages/location/data/timezone_-5.5.png
new file mode 100644
index 0000000..b1c788d
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-5.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-5.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_-5.5_dim.png
new file mode 100644
index 0000000..cde398b
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-5.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-5.png b/gnome-initial-setup/pages/location/data/timezone_-5.png
new file mode 100644
index 0000000..06c15e6
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-5_dim.png b/gnome-initial-setup/pages/location/data/timezone_-5_dim.png
new file mode 100644
index 0000000..85a0325
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-6.png b/gnome-initial-setup/pages/location/data/timezone_-6.png
new file mode 100644
index 0000000..8505fb1
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-6.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-6_dim.png b/gnome-initial-setup/pages/location/data/timezone_-6_dim.png
new file mode 100644
index 0000000..e6de4c6
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-6_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-7.png b/gnome-initial-setup/pages/location/data/timezone_-7.png
new file mode 100644
index 0000000..fec235d
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-7.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-7_dim.png b/gnome-initial-setup/pages/location/data/timezone_-7_dim.png
new file mode 100644
index 0000000..aad26c0
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-7_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-8.png b/gnome-initial-setup/pages/location/data/timezone_-8.png
new file mode 100644
index 0000000..bdad7bf
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-8.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-8_dim.png b/gnome-initial-setup/pages/location/data/timezone_-8_dim.png
new file mode 100644
index 0000000..7caeec7
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-8_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-9.5.png b/gnome-initial-setup/pages/location/data/timezone_-9.5.png
new file mode 100644
index 0000000..b1c788d
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-9.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-9.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_-9.5_dim.png
new file mode 100644
index 0000000..9b1b71c
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-9.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-9.png b/gnome-initial-setup/pages/location/data/timezone_-9.png
new file mode 100644
index 0000000..04cb3cb
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-9.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_-9_dim.png b/gnome-initial-setup/pages/location/data/timezone_-9_dim.png
new file mode 100644
index 0000000..578b1bd
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_-9_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_0.png b/gnome-initial-setup/pages/location/data/timezone_0.png
new file mode 100644
index 0000000..e59b773
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_0.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_0_dim.png b/gnome-initial-setup/pages/location/data/timezone_0_dim.png
new file mode 100644
index 0000000..13e7ac9
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_0_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_1.png b/gnome-initial-setup/pages/location/data/timezone_1.png
new file mode 100644
index 0000000..2053b7e
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_1.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_10.5.png b/gnome-initial-setup/pages/location/data/timezone_10.5.png
new file mode 100644
index 0000000..6ec7f9f
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_10.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_10.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_10.5_dim.png
new file mode 100644
index 0000000..359911f
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_10.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_10.png b/gnome-initial-setup/pages/location/data/timezone_10.png
new file mode 100644
index 0000000..475dcf4
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_10.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_10_dim.png b/gnome-initial-setup/pages/location/data/timezone_10_dim.png
new file mode 100644
index 0000000..9521033
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_10_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_11.5.png b/gnome-initial-setup/pages/location/data/timezone_11.5.png
new file mode 100644
index 0000000..afdedd7
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_11.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_11.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_11.5_dim.png
new file mode 100644
index 0000000..00cc5b8
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_11.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_11.png b/gnome-initial-setup/pages/location/data/timezone_11.png
new file mode 100644
index 0000000..6168aa2
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_11.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_11_dim.png b/gnome-initial-setup/pages/location/data/timezone_11_dim.png
new file mode 100644
index 0000000..5a1df4e
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_11_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_12.75.png b/gnome-initial-setup/pages/location/data/timezone_12.75.png
new file mode 100644
index 0000000..4f74a85
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_12.75.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_12.75_dim.png b/gnome-initial-setup/pages/location/data/timezone_12.75_dim.png
new file mode 100644
index 0000000..cc7dbde
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_12.75_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_12.png b/gnome-initial-setup/pages/location/data/timezone_12.png
new file mode 100644
index 0000000..d0b3531
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_12.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_12_dim.png b/gnome-initial-setup/pages/location/data/timezone_12_dim.png
new file mode 100644
index 0000000..71514a8
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_12_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_13.png b/gnome-initial-setup/pages/location/data/timezone_13.png
new file mode 100644
index 0000000..fe2f134
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_13.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_13_dim.png b/gnome-initial-setup/pages/location/data/timezone_13_dim.png
new file mode 100644
index 0000000..90e689d
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_13_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_14.png b/gnome-initial-setup/pages/location/data/timezone_14.png
new file mode 100644
index 0000000..e91d4eb
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_14.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_14_dim.png b/gnome-initial-setup/pages/location/data/timezone_14_dim.png
new file mode 100644
index 0000000..e4f0a0a
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_14_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_1_dim.png b/gnome-initial-setup/pages/location/data/timezone_1_dim.png
new file mode 100644
index 0000000..b36ff22
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_1_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_2.png b/gnome-initial-setup/pages/location/data/timezone_2.png
new file mode 100644
index 0000000..ec1e874
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_2.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_2_dim.png b/gnome-initial-setup/pages/location/data/timezone_2_dim.png
new file mode 100644
index 0000000..fba1021
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_2_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_3.5.png b/gnome-initial-setup/pages/location/data/timezone_3.5.png
new file mode 100644
index 0000000..2dc7399
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_3.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_3.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_3.5_dim.png
new file mode 100644
index 0000000..76eab2e
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_3.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_3.png b/gnome-initial-setup/pages/location/data/timezone_3.png
new file mode 100644
index 0000000..eda59dc
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_3.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_3_dim.png b/gnome-initial-setup/pages/location/data/timezone_3_dim.png
new file mode 100644
index 0000000..d718bbc
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_3_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_4.5.png b/gnome-initial-setup/pages/location/data/timezone_4.5.png
new file mode 100644
index 0000000..e09ed90
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_4.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_4.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_4.5_dim.png
new file mode 100644
index 0000000..74461fe
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_4.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_4.png b/gnome-initial-setup/pages/location/data/timezone_4.png
new file mode 100644
index 0000000..483dc53
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_4.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_4_dim.png b/gnome-initial-setup/pages/location/data/timezone_4_dim.png
new file mode 100644
index 0000000..ce18078
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_4_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_5.5.png b/gnome-initial-setup/pages/location/data/timezone_5.5.png
new file mode 100644
index 0000000..f904cc2
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_5.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_5.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_5.5_dim.png
new file mode 100644
index 0000000..c598242
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_5.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_5.75.png b/gnome-initial-setup/pages/location/data/timezone_5.75.png
new file mode 100644
index 0000000..827ce1a
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_5.75.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_5.75_dim.png b/gnome-initial-setup/pages/location/data/timezone_5.75_dim.png
new file mode 100644
index 0000000..1b972ff
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_5.75_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_5.png b/gnome-initial-setup/pages/location/data/timezone_5.png
new file mode 100644
index 0000000..1bb6d20
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_5_dim.png b/gnome-initial-setup/pages/location/data/timezone_5_dim.png
new file mode 100644
index 0000000..9165f64
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_6.5.png b/gnome-initial-setup/pages/location/data/timezone_6.5.png
new file mode 100644
index 0000000..d307bf3
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_6.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_6.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_6.5_dim.png
new file mode 100644
index 0000000..7d99a0f
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_6.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_6.png b/gnome-initial-setup/pages/location/data/timezone_6.png
new file mode 100644
index 0000000..460f9cf
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_6.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_6_dim.png b/gnome-initial-setup/pages/location/data/timezone_6_dim.png
new file mode 100644
index 0000000..afcd2b3
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_6_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_7.png b/gnome-initial-setup/pages/location/data/timezone_7.png
new file mode 100644
index 0000000..239115a
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_7.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_7_dim.png b/gnome-initial-setup/pages/location/data/timezone_7_dim.png
new file mode 100644
index 0000000..e59f0db
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_7_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_8.75.png b/gnome-initial-setup/pages/location/data/timezone_8.75.png
new file mode 100644
index 0000000..2a2917f
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_8.75.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_8.75_dim.png b/gnome-initial-setup/pages/location/data/timezone_8.75_dim.png
new file mode 100644
index 0000000..fb9caf4
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_8.75_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_8.png b/gnome-initial-setup/pages/location/data/timezone_8.png
new file mode 100644
index 0000000..d210222
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_8.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_8_dim.png b/gnome-initial-setup/pages/location/data/timezone_8_dim.png
new file mode 100644
index 0000000..9612511
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_8_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_9.5.png b/gnome-initial-setup/pages/location/data/timezone_9.5.png
new file mode 100644
index 0000000..1c3290c
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_9.5.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_9.5_dim.png b/gnome-initial-setup/pages/location/data/timezone_9.5_dim.png
new file mode 100644
index 0000000..6a9b9ed
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_9.5_dim.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_9.png b/gnome-initial-setup/pages/location/data/timezone_9.png
new file mode 100644
index 0000000..65d2e46
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_9.png differ
diff --git a/gnome-initial-setup/pages/location/data/timezone_9_dim.png b/gnome-initial-setup/pages/location/data/timezone_9_dim.png
new file mode 100644
index 0000000..8cbb2e7
Binary files /dev/null and b/gnome-initial-setup/pages/location/data/timezone_9_dim.png differ
diff --git a/gnome-initial-setup/pages/location/datetime.gresource.xml b/gnome-initial-setup/pages/location/datetime.gresource.xml
new file mode 100644
index 0000000..675a915
--- /dev/null
+++ b/gnome-initial-setup/pages/location/datetime.gresource.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/control-center/datetime">
+    <file alias="bg.png">data/bg.png</file>
+    <file alias="bg_dim.png">data/bg_dim.png</file>
+    <file alias="cc.png">data/cc.png</file>
+    <file alias="pin.png">data/pin.png</file>
+    <file alias="timezone_0.png">data/timezone_0.png</file>
+    <file alias="timezone_0_dim.png">data/timezone_0_dim.png</file>
+    <file alias="timezone_-10.png">data/timezone_-10.png</file>
+    <file alias="timezone_-10_dim.png">data/timezone_-10_dim.png</file>
+    <file alias="timezone_10.png">data/timezone_10.png</file>
+    <file alias="timezone_10_dim.png">data/timezone_10_dim.png</file>
+    <file alias="timezone_10.5.png">data/timezone_10.5.png</file>
+    <file alias="timezone_10.5_dim.png">data/timezone_10.5_dim.png</file>
+    <file alias="timezone_-1.png">data/timezone_-1.png</file>
+    <file alias="timezone_-1_dim.png">data/timezone_-1_dim.png</file>
+    <file alias="timezone_1.png">data/timezone_1.png</file>
+    <file alias="timezone_1_dim.png">data/timezone_1_dim.png</file>
+    <file alias="timezone_-11.png">data/timezone_-11.png</file>
+    <file alias="timezone_-11_dim.png">data/timezone_-11_dim.png</file>
+    <file alias="timezone_11.png">data/timezone_11.png</file>
+    <file alias="timezone_11_dim.png">data/timezone_11_dim.png</file>
+    <file alias="timezone_11.5.png">data/timezone_11.5.png</file>
+    <file alias="timezone_11.5_dim.png">data/timezone_11.5_dim.png</file>
+    <file alias="timezone_12.png">data/timezone_12.png</file>
+    <file alias="timezone_12_dim.png">data/timezone_12_dim.png</file>
+    <file alias="timezone_12.75.png">data/timezone_12.75.png</file>
+    <file alias="timezone_12.75_dim.png">data/timezone_12.75_dim.png</file>
+    <file alias="timezone_13.png">data/timezone_13.png</file>
+    <file alias="timezone_13_dim.png">data/timezone_13_dim.png</file>
+    <file alias="timezone_14.png">data/timezone_14.png</file>
+    <file alias="timezone_14_dim.png">data/timezone_14_dim.png</file>
+    <file alias="timezone_-2.png">data/timezone_-2.png</file>
+    <file alias="timezone_-2_dim.png">data/timezone_-2_dim.png</file>
+    <file alias="timezone_2.png">data/timezone_2.png</file>
+    <file alias="timezone_2_dim.png">data/timezone_2_dim.png</file>
+    <file alias="timezone_-3.png">data/timezone_-3.png</file>
+    <file alias="timezone_-3_dim.png">data/timezone_-3_dim.png</file>
+    <file alias="timezone_3.png">data/timezone_3.png</file>
+    <file alias="timezone_3_dim.png">data/timezone_3_dim.png</file>
+    <file alias="timezone_-3.5.png">data/timezone_-3.5.png</file>
+    <file alias="timezone_-3.5_dim.png">data/timezone_-3.5_dim.png</file>
+    <file alias="timezone_3.5.png">data/timezone_3.5.png</file>
+    <file alias="timezone_3.5_dim.png">data/timezone_3.5_dim.png</file>
+    <file alias="timezone_-4.png">data/timezone_-4.png</file>
+    <file alias="timezone_-4_dim.png">data/timezone_-4_dim.png</file>
+    <file alias="timezone_4.png">data/timezone_4.png</file>
+    <file alias="timezone_4_dim.png">data/timezone_4_dim.png</file>
+    <file alias="timezone_-4.5.png">data/timezone_-4.5.png</file>
+    <file alias="timezone_-4.5_dim.png">data/timezone_-4.5_dim.png</file>
+    <file alias="timezone_4.5.png">data/timezone_4.5.png</file>
+    <file alias="timezone_4.5_dim.png">data/timezone_4.5_dim.png</file>
+    <file alias="timezone_-5.png">data/timezone_-5.png</file>
+    <file alias="timezone_-5_dim.png">data/timezone_-5_dim.png</file>
+    <file alias="timezone_5.png">data/timezone_5.png</file>
+    <file alias="timezone_5_dim.png">data/timezone_5_dim.png</file>
+    <file alias="timezone_-5.5.png">data/timezone_-5.5.png</file>
+    <file alias="timezone_-5.5_dim.png">data/timezone_-5.5_dim.png</file>
+    <file alias="timezone_5.5.png">data/timezone_5.5.png</file>
+    <file alias="timezone_5.5_dim.png">data/timezone_5.5_dim.png</file>
+    <file alias="timezone_5.75.png">data/timezone_5.75.png</file>
+    <file alias="timezone_5.75_dim.png">data/timezone_5.75_dim.png</file>
+    <file alias="timezone_-6.png">data/timezone_-6.png</file>
+    <file alias="timezone_-6_dim.png">data/timezone_-6_dim.png</file>
+    <file alias="timezone_6.png">data/timezone_6.png</file>
+    <file alias="timezone_6_dim.png">data/timezone_6_dim.png</file>
+    <file alias="timezone_6.5.png">data/timezone_6.5.png</file>
+    <file alias="timezone_6.5_dim.png">data/timezone_6.5_dim.png</file>
+    <file alias="timezone_-7.png">data/timezone_-7.png</file>
+    <file alias="timezone_-7_dim.png">data/timezone_-7_dim.png</file>
+    <file alias="timezone_7.png">data/timezone_7.png</file>
+    <file alias="timezone_7_dim.png">data/timezone_7_dim.png</file>
+    <file alias="timezone_-8.png">data/timezone_-8.png</file>
+    <file alias="timezone_-8_dim.png">data/timezone_-8_dim.png</file>
+    <file alias="timezone_8.png">data/timezone_8.png</file>
+    <file alias="timezone_8_dim.png">data/timezone_8_dim.png</file>
+    <file alias="timezone_8.75.png">data/timezone_8.75.png</file>
+    <file alias="timezone_8.75_dim.png">data/timezone_8.75_dim.png</file>
+    <file alias="timezone_-9.png">data/timezone_-9.png</file>
+    <file alias="timezone_-9_dim.png">data/timezone_-9_dim.png</file>
+    <file alias="timezone_9.png">data/timezone_9.png</file>
+    <file alias="timezone_9_dim.png">data/timezone_9_dim.png</file>
+    <file alias="timezone_-9.5.png">data/timezone_-9.5.png</file>
+    <file alias="timezone_-9.5_dim.png">data/timezone_-9.5_dim.png</file>
+    <file alias="timezone_9.5.png">data/timezone_9.5.png</file>
+    <file alias="timezone_9.5_dim.png">data/timezone_9.5_dim.png</file>
+  </gresource>
+</gresources>
diff --git a/gnome-initial-setup/pages/location/tz.c b/gnome-initial-setup/pages/location/tz.c
index c1ba940..c539d59 100644
--- a/gnome-initial-setup/pages/location/tz.c
+++ b/gnome-initial-setup/pages/location/tz.c
@@ -4,13 +4,13 @@
  * Copyright (C) 2000-2001 Ximian, Inc.
  *
  * Authors: Hans Petter Jansson <hpj ximian com>
- *
+ * 
  * Largely based on Michael Fulbright's work on Anaconda.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
 
@@ -204,10 +203,12 @@ tz_info_from_location (TzLocation *loc)
 	TzInfo *tzinfo;
 	time_t curtime;
 	struct tm *curzone;
+	gchar *tz_env_value;
 	
 	g_return_val_if_fail (loc != NULL, NULL);
 	g_return_val_if_fail (loc->zone != NULL, NULL);
 	
+	tz_env_value = g_strdup (getenv ("TZ"));
 	setenv ("TZ", loc->zone, 1);
 	
 #if 0
@@ -237,7 +238,12 @@ tz_info_from_location (TzLocation *loc)
 
 	tzinfo->daylight = curzone->tm_isdst;
 
-	setenv ("TZ", "", 1);
+	if (tz_env_value)
+		setenv ("TZ", tz_env_value, 1);
+	else
+		unsetenv ("TZ");
+
+	g_free (tz_env_value);
 	
 	return tzinfo;
 }
diff --git a/gnome-initial-setup/pages/location/tz.h b/gnome-initial-setup/pages/location/tz.h
index 27ecd5a..71c1c23 100644
--- a/gnome-initial-setup/pages/location/tz.h
+++ b/gnome-initial-setup/pages/location/tz.h
@@ -7,10 +7,10 @@
  * 
  * Largely based on Michael Fulbright's work on Anaconda.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */