Merge lp:~larsu/unity-control-center/add-sound-indicator-visible-checkbox into lp:~ubuntu-desktop/unity-control-center/trunk

[Lars Karlitski]

Add "Show sound volume in the menu bar" check box

Add "Show sound volume in the menu bar" check box

[lp:~larsu/unity-control-center/add-sound-indicator-visible-checkbox]

12742. By Lars Karlitski on 2014-03-04

Merge trunk

Unmerged revisions

12742. By Lars Karlitski on 2014-03-04

Merge trunk

12741. By Lars Karlitski on 2014-03-03

Add "Show sound volume in the menu bar" check box

12740. By Lars Karlitski on 2014-03-03

Rename indicator_settings to sound_settings

12739. By PS Jenkins bot on 2014-02-26

Releasing 14.04.3+14.04.20140226-0ubuntu1

12738. By Sebastien Bacher on 2014-02-26

Backport some bugfixes and small improvements Fixes: 1280742

12737. By Robert Ancell on 2014-02-26

Compile with unity-settings-daemon instead of gnome-settings-daemon Fixes: 1277585

12736. By Eleni Maria Stea on 2014-02-26

In display add_dict_entry:
replaced the gvariant arrays with gvariant builder to simplify the code

12735. By Sebastien Bacher on 2014-02-26

shell: don't set a secondary icon, GtkSearchEntry already has one

12734. By Sebastien Bacher on 2014-02-26

shell: backport fixes from gnome-3-8. Those include some tweaks to the
command line options, improvements to the keyboard navigation in the icons
grid, and support for bash completion

12733. By PS Jenkins bot on 2014-02-25

Releasing 14.04.3+14.04.20140225-0ubuntu1

=== modified file 'configure.ac'
--- configure.ac	2014-01-28 22:26:00 +0000
+++ configure.ac	2014-03-03 10:09:16 +0000
@@ -1,4 +1,4 @@
-m4_define([unity_control_center_version], 14.04.2)
+m4_define([unity_control_center_version], 14.04.3)
 AC_INIT([unity-control-center], [unity_control_center_version])
 
 AC_CONFIG_SRCDIR([shell])
@@ -70,17 +70,6 @@
 
 AC_CHECK_LIB(m, floor)
 
-AC_ARG_ENABLE([systemd],
-              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-              [with_systemd=$enableval],
-              [with_systemd=no])
-if test "$with_systemd" = "yes" ; then
-  SYSTEMD=libsystemd-login
-  AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
-else
-  SYSTEMD=
-fi
-
 # IBus support
 IBUS_REQUIRED_VERSION=1.4.99
 
@@ -102,19 +91,19 @@
 dnl ==============================================
 
 GLIB_REQUIRED_VERSION=2.31.2
-GTK_REQUIRED_VERSION=3.5.13
+GTK_REQUIRED_VERSION=3.10.0
 PA_REQUIRED_VERSION=2.0
 CANBERRA_REQUIRED_VERSION=0.13
 GDKPIXBUF_REQUIRED_VERSION=2.23.0
 POLKIT_REQUIRED_VERSION=0.103
-GSD_REQUIRED_VERSION=3.6.0
 NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
 GNOME_DESKTOP_REQUIRED_VERSION=3.5.91
 SCHEMAS_REQUIRED_VERSION=3.7.2.2
-LIBWACOM_REQUIRED_VERSION=0.6
+LIBWACOM_REQUIRED_VERSION=0.7
 CLUTTER_REQUIRED_VERSION=1.11.3
 GOA_REQUIRED_VERSION=3.5.90
+ACCOUNTSSERVICE_REQUIRED_VERSION=0.6.30
 
 COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
  glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -130,10 +119,8 @@
 PKG_CHECK_MODULES(SHELL, $COMMON_MODULES libgnome-menu-3.0 gio-unix-2.0 x11)
 PKG_CHECK_MODULES(APPEARANCE_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
-PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
+PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES timezonemap
+                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
 PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0 x11)
 PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 gl x11
 		  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION webkitgtk-3.0)
@@ -142,10 +129,10 @@
                   x11)
 PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
-                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+                  unity-settings-daemon x11)
 PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+                  unity-settings-daemon)
 PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
 PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
@@ -165,7 +152,9 @@
                   gnome-desktop-3.0
                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
                   pwquality
-                  $SYSTEMD)
+                  accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION)
+
+AM_PROG_VALAC([0.20.0])
 
 GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
 AC_SUBST(GDESKTOP_PREFIX)
@@ -245,9 +234,10 @@
       have_wacom=no
     else
       PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-                        gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+                        unity-settings-daemon
                         xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+      AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
       have_wacom=yes
     fi
     ;;
@@ -412,6 +402,8 @@
 panels/appearance/unity-appearance-panel.desktop.in
 panels/bluetooth/Makefile
 panels/bluetooth/unity-bluetooth-panel.desktop.in
+panels/datetime/Makefile
+panels/datetime/unity-datetime-panel.desktop.in
 panels/display/Makefile
 panels/display/unity-display-panel.desktop.in
 panels/keyboard/Makefile
@@ -477,7 +469,6 @@
 panels/user-accounts/Makefile
 panels/user-accounts/data/Makefile
 panels/user-accounts/data/unity-user-accounts-panel.desktop.in
-panels/user-accounts/data/icons/Makefile
 panels/wacom/Makefile
 panels/wacom/calibrator/Makefile
 panels/wacom/unity-wacom-panel.desktop.in
@@ -513,11 +504,6 @@
 else
 	AC_MSG_NOTICE([   Appearance panel Flickr support disabled])
 fi
-if test "x$with_systemd" = "xyes"; then
-	AC_MSG_NOTICE([** systemd (Systemd session tracking)])
-else
-	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
-fi
 if test "x$have_wacom" = "xyes"; then
 	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
 else

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-31 10:50:22 +0000
+++ debian/changelog	2014-03-03 10:09:16 +0000
@@ -1,3 +1,137 @@
+unity-control-center (14.04.3+14.04.20140226-0ubuntu1) trusty; urgency=low
+
+  [ Robert Ancell ]
+  * Compile with unity-settings-daemon instead of gnome-settings-daemon
+    (LP: #1277585)
+
+  [ Sebastien Bacher ]
+  * shell: backport fixes from gnome-3-8. Those include some tweaks to
+    the command line options, improvements to the keyboard navigation in
+    the icons grid, and support for bash completion
+  * shell: don't set a secondary icon, GtkSearchEntry already has one
+  * Backport some bugfixes and small improvements (LP: #1280742)
+
+  [ Eleni Maria Stea ]
+  * In display add_dict_entry: replaced the gvariant arrays with
+    gvariant builder to simplify the code
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 26 Feb 2014 20:01:37 +0000
+
+unity-control-center (14.04.3+14.04.20140225-0ubuntu1) trusty; urgency=low
+
+  [ Sebastien Bacher ]
+  * update to the GNOME 3.8 codebase, remove quite some custom code to
+    use libaccountsservice. The update also includes a view of the login
+    history informations and bugfixes.
+
+  [ Eleni Maria Stea ]
+  * fixed race condition when the monitor is not detected correctly (and
+    the monitor name is null) added a mark in 1.0 (default value) (LP:
+    #1283297)
+
+  [ Lars Uebernickel ]
+  * sound/gvc-{balance,channel}-bar: let scales use all the available
+    space
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 25 Feb 2014 09:34:37 +0000
+
+unity-control-center (14.04.3+14.04.20140224-0ubuntu1) trusty; urgency=low
+
+  [ Sebastien Bacher ]
+  * Use new sound key, avoid depending on indicator-sound
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 24 Feb 2014 14:36:20 +0000
+
+unity-control-center (14.04.3+14.04.20140221-0ubuntu1) trusty; urgency=low
+
+  [ Sebastien Bacher ]
+  * bluetooth: let hide the bluetooth indicator, thanks Charles Kerr
+    (LP: #829690)
+
+  [ Dimitri John Ledkov ]
+  * Regenerate versioned logo.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 21 Feb 2014 18:46:27 +0000
+
+unity-control-center (14.04.3+14.04.20140220.2-0ubuntu1) trusty; urgency=low
+
+  [ William Hua ]
+  * Support legacy method of launching IBus setup panels.
+  * Fix incorrect unref which was causing a critical on the region
+    panel.
+
+  [ Lars Uebernickel ]
+  * sound: various UI tweaks Most importantly, add a "allow louder than
+    100%" checkbox (feeding from a key in com.canonical.indicator.sound)
+    that controls whether output volume can be amplified.
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 20 Feb 2014 21:18:01 +0000
+
+unity-control-center (14.04.3+14.04.20140220.1-0ubuntu1) trusty; urgency=low
+
+  [ Sebastien Bacher ]
+  * info: backport fixes and cleanings from gnome-3-8
+  * [bluetooth] backport some upstream changes
+
+  [ Iain Lane ]
+  * gsettings-ubuntu-schemas should be in Depends, not Build Depends
+
+  [ Marco Trevisan (Treviño) ]
+  * Appearance: Add Application Menu settings to Unity behaviour tab
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 20 Feb 2014 18:22:53 +0000
+
+unity-control-center (14.04.3+14.04.20140220-0ubuntu1) trusty; urgency=low
+
+  [ Eleni Maria Stea ]
+  * Add a slider that can change the fonts-scale-factor gsetting (per
+    monitor text scaling factor)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 20 Feb 2014 10:43:50 +0000
+
+unity-control-center (14.04.3+14.04.20140219-0ubuntu1) trusty; urgency=low
+
+  [ Robert Ancell ]
+  * Fix various compile warnings.
+  * Stop using deprecated GtkStock.
+  * Stop using deprecated GdkColor.
+  * Use appropriate GSettings API for checking existence of schemas.
+  * Backport Wacom panel from GNOME Control Center 3.8
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 19 Feb 2014 10:42:13 +0000
+
+unity-control-center (14.04.3-0ubuntu1) trusty; urgency=medium
+
+  * Add option to toggle username in session indicator (LP: #1116497)
+
+  [ Sebastian Bacher ]
+  * debian/control.in:
+    - Build-Depends on dh-migrations
+  * debian/unity-control-center.migrations, debian/ucc-unity-launcher.py:
+    - script to migration the g-c-c Unity's launcher entry to u-c-c
+  * debian/rules:
+    - clean some leftover references to g-c-c
+    - use dh_migrations.
+
+ -- Robert Ancell <[e-mail]>  Tue, 18 Feb 2014 12:12:04 +1300
+
+unity-control-center (14.04.2-0ubuntu1) trusty; urgency=medium
+
+  * Merge in datetime panel from indicator-datetime
+  * Backport commit to fix notebook spacing issues.
+  * Let the launcher icons be scaled down to 16. (LP: #1168409).
+  * keyboard: wrap information label in the shortcuts panel. (LP: #1276119).             
+
+ -- Robert Ancell <[e-mail]>  Fri, 14 Feb 2014 14:28:24 +1300
+
+unity-control-center (14.04.1-0ubuntu5) trusty; urgency=medium
+
+  * debian/control:
+    - Run with either gnome-settings-daemon or unity-settings-daemon
+      (LP: #1277487)
+
+ -- Robert Ancell <[e-mail]>  Fri, 07 Feb 2014 16:22:09 +0000
+
 unity-control-center (14.04.1-0ubuntu4) trusty; urgency=medium
 
   * don't set the alignment of a frame that doesn't exist, fixes a warning

=== modified file 'debian/control'
--- debian/control	2014-01-28 22:26:00 +0000
+++ debian/control	2014-03-03 10:09:16 +0000
@@ -6,14 +6,16 @@
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
                debhelper (>= 9),
+               dh-migrations,
                desktop-file-utils,
                gtk-doc-tools,
                gnome-common,
                gnome-pkg-tools (>= 0.10),
-               gnome-settings-daemon-dev (>= 3.8.4),
+               unity-settings-daemon-dev,
                gsettings-desktop-schemas-dev (>= 3.7.2.2),
                hardening-wrapper,
                intltool (>= 0.37.1),
+               libaccountsservice-dev (>= 0.6.30),
                libcanberra-gtk3-dev,
                libcheese-gtk-dev (>= 2.91.91.1),
                libcolord-dev,
@@ -28,7 +30,7 @@
                libgnomekbd-dev,
                libgoa-1.0-dev (>= 3.5.90),
                libgstreamer-plugins-base0.10-dev,
-               libgtk-3-dev (>= 3.5.13),
+               libgtk-3-dev (>= 3.10.0),
                libgtop2-dev,
                libibus-1.0-dev (>= 1.5.0),
                libnm-glib-dev (>= 0.9) [linux-any],
@@ -39,8 +41,8 @@
                libpulse-dev (>= 1:2.0),
                libpwquality-dev,
                libupower-glib-dev (>= 0.9.1),
-               libsystemd-login-dev,
-               libwacom-dev (>= 0.6),
+               libtimezonemap1-dev,
+               libwacom-dev (>= 0.7),
                libx11-dev,
                libxft-dev (>= 2.1.2),
                libxkbfile-dev,
@@ -49,8 +51,10 @@
                locales,
                network-manager-dev (>= 0.9) [linux-any],
                shared-mime-info,
+               ttf-ubuntu-font-family,
                libwebkitgtk-3.0-dev,
                libgl1-mesa-dev,
+               valac (>= 0.20.0),
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu
 
 Package: unity-control-center
@@ -66,8 +70,9 @@
          gnome-icon-theme (>= 2.24),
          gnome-icon-theme-symbolic,
          gnome-menus (>= 2.12.0),
-         gnome-settings-daemon (>= 3.8.4),
+         unity-settings-daemon,
          gsettings-desktop-schemas (>= 3.5.91),
+         gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
 Recommends: cups-pk-helper,
             gnome-session-bin,
             ubuntu-system-service,
@@ -77,8 +82,10 @@
             policykit-1-gnome,
             libcanberra-pulse,
             system-config-printer-gnome
-Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50)
-Replaces: gnome-bluetooth (<< 3.4.0)
+Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
+           unity-control-center-datetime
+Replaces: gnome-bluetooth (<< 3.4.0),
+          unity-control-center-datetime
 Breaks: gnome-power-manager (<< 3.0),
         gnome-session (<< 3.0),
         libglib2.0-0 (<< 2.28.6-2),
@@ -91,6 +98,7 @@
           gstreamer0.10-pulseaudio,
           libcanberra-gtk-module,
           x11-xserver-utils
+Provides: unity-control-center-datetime
 Description: utilities to configure the GNOME desktop
  This package contains configuration applets for the GNOME desktop,
  allowing to set accessibility configuration, desktop fonts, keyboard

=== modified file 'debian/rules'
--- debian/rules	2013-12-02 00:26:01 +0000
+++ debian/rules	2014-03-03 10:09:16 +0000
@@ -11,14 +11,12 @@
 
 DEB_CONFIGURE_SCRIPT := ./autogen.sh
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-                             --disable-update-mimedb \
-                             --enable-systemd
-
-DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act
-
-binary-post-install/gnome-control-center-data::
-	rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache
-	rm -rf debian/capplets-data/usr/share/pkgconfig
-	dh_installmime -p$(cdbs_curpkg)
+                             --disable-update-mimedb
+
+DEB_DH_MAKESHLIBS_ARGS_unity-control-center = --no-act
+
+binary-post-install/unity-control-center::
+	dh_migrations -p$(cdbs_curpkg)
+	./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 14.04 LTS" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
 
 common-binary-post-install-arch:: list-missing

=== added file 'debian/ucc-unity-launcher.py'
--- debian/ucc-unity-launcher.py	1970-01-01 00:00:00 +0000
+++ debian/ucc-unity-launcher.py	2014-03-03 10:09:16 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2013 Canonical
+
+from gi.repository import Gio
+import os,sys
+
+if "com.canonical.Unity.Launcher" not in Gio.Settings.list_schemas():
+    print("No unity schemas found, no migration needed")
+    sys.exit(0)
+
+gsettings=Gio.Settings(schema="com.canonical.Unity.Launcher", path="/com/canonical/unity/launcher/")
+launcher_list = gsettings.get_strv("favorites")
+
+# Replace g-c-c by u-c-c in the unity launcher
+try:
+    idx=launcher_list.index("application://gnome-control-center.desktop")
+    launcher_list[idx]="application://unity-control-center.desktop"
+except ValueError:
+    pass
+# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
+from subprocess import Popen, PIPE, STDOUT
+p = Popen(['dconf', 'load', '/com/canonical/unity/launcher/'], stdout=PIPE, stdin=PIPE, stderr=STDOUT)
+p.communicate(input="[/]\nfavorites={}".format(launcher_list).encode('utf-8'))

=== modified file 'debian/unity-control-center.install'
--- debian/unity-control-center.install	2013-12-11 23:12:25 +0000
+++ debian/unity-control-center.install	2014-03-03 10:09:16 +0000
@@ -2,6 +2,7 @@
 usr/bin
 usr/lib/*/unity-control-center-1/panels/*.so
 usr/share/applications
+usr/share/bash-completion
 usr/share/man
 usr/share/unity-control-center
 usr/share/desktop-directories

=== added file 'debian/unity-control-center.migrations'
--- debian/unity-control-center.migrations	1970-01-01 00:00:00 +0000
+++ debian/unity-control-center.migrations	2014-03-03 10:09:16 +0000
@@ -0,0 +1,1 @@
+debian/ucc-unity-launcher.py

=== modified file 'panels/Makefile.am'
--- panels/Makefile.am	2013-12-03 03:04:42 +0000
+++ panels/Makefile.am	2014-03-03 10:09:16 +0000
@@ -1,6 +1,7 @@
 SUBDIRS= \
 	appearance \
 	common \
+	datetime \
 	screen \
 	power \
 	color \

=== modified file 'panels/appearance/appearance.ui'
--- panels/appearance/appearance.ui	2014-01-28 22:26:00 +0000
+++ panels/appearance/appearance.ui	2014-03-03 10:09:16 +0000
@@ -363,9 +363,6 @@
                         <property name="can_focus">False</property>
                         <property name="toolbar_style">icons</property>
                         <property name="icon_size">1</property>
-                        <style>
-                          <class name="inline-toolbar"/>
-                        </style>
                         <child>
                           <object class="GtkToolButton" id="add_button">
                             <property name="visible">True</property>
@@ -393,6 +390,9 @@
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="inline-toolbar"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -883,10 +883,111 @@
               </packing>
             </child>
             <child>
+              <object class="GtkSeparator" id="separator4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="unity_menus_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">10</property>
+                <property name="margin_right">10</property>
+                <property name="border_width">0</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">2</property>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Application Menu&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="unity_menus_type_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">10</property>
+                    <property name="margin_top">9</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkRadioButton" id="unity_global_menus">
+                        <property name="label" translatable="yes">In top bar</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">unity_local_menus</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="unity_local_menus">
+                        <property name="label" translatable="yes">In window title bars</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">unity_global_menus</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">5</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator" id="menu_separator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkBox" id="box5">
                 <property name="height_request">36</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">10</property>
                 <child>
                   <object class="GtkButton" id="button-restore-unitybehavior">
                     <property name="label" translatable="yes">Restore Default Behaviours</property>
@@ -909,15 +1010,9 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">6</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="position">1</property>

=== modified file 'panels/appearance/bg-pictures-source.c'
--- panels/appearance/bg-pictures-source.c	2013-12-02 02:45:53 +0000
+++ panels/appearance/bg-pictures-source.c	2014-03-03 10:09:16 +0000
@@ -45,6 +45,14 @@
   GHashTable *known_items;
 };
 
+const char * const content_types[] = {
+	"image/png",
+	"image/jpeg",
+	"image/bmp",
+	"image/svg+xml",
+	NULL
+};
+
 static char *bg_pictures_source_get_unique_filename (const char *uri);
 
 static void
@@ -127,32 +135,91 @@
   object_class->finalize = bg_pictures_source_finalize;
 }
 
+static int
+sort_func (GtkTreeModel *model,
+           GtkTreeIter *a,
+           GtkTreeIter *b,
+           BgPicturesSource *bg_source)
+{
+  CcAppearanceItem *item_a;
+  CcAppearanceItem *item_b;
+  const char *name_a;
+  const char *name_b;
+  int retval;
+
+  gtk_tree_model_get (model, a,
+                      1, &item_a,
+                      -1);
+  gtk_tree_model_get (model, b,
+                      1, &item_b,
+                      -1);
+
+  name_a = cc_appearance_item_get_name (item_a);
+  name_b = cc_appearance_item_get_name (item_b);
+
+  retval = g_utf8_collate (name_a, name_b);
+
+  g_object_unref (item_a);
+  g_object_unref (item_b);
+
+  return retval;
+}
+
 static void
 picture_scaled (GObject *source_object,
                 GAsyncResult *res,
                 gpointer user_data)
 {
-  BgPicturesSource *bg_source = BG_PICTURES_SOURCE (user_data);
+  BgPicturesSource *bg_source;
   CcAppearanceItem *item;
   GError *error = NULL;
   GdkPixbuf *pixbuf;
   const char *source_url;
-
+  const char *software;
   GtkTreeIter iter;
   GtkListStore *store;
 
-  store = bg_source_get_liststore (BG_SOURCE (bg_source));
-  item = g_object_get_data (source_object, "item");
-
   pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
   if (pixbuf == NULL)
     {
-      g_warning ("Failed to load image: %s", error->message);
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("Failed to load image: %s", error->message);
+
       g_error_free (error);
+      return;
+    }
+
+  /* since we were not cancelled, we can now cast user_data
+   * back to BgPicturesSource.
+   */
+  bg_source = BG_PICTURES_SOURCE (user_data);
+  store = bg_source_get_liststore (BG_SOURCE (bg_source));
+  item = g_object_get_data (source_object, "item");
+
+  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (store),
+                                   1,
+                                   (GtkTreeIterCompareFunc)sort_func,
+                                   bg_source,
+                                   NULL);
+
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+                                        1,
+                                        GTK_SORT_ASCENDING);
+
+  /* Ignore screenshots */
+  software = gdk_pixbuf_get_option (pixbuf, "tEXt::Software");
+  if (software != NULL &&
+      g_str_equal (software, "gnome-screenshot"))
+    {
+      g_debug ("Ignored URL '%s' as it's a screenshot from gnome-screenshot",
+               cc_appearance_item_get_uri (item));
+      g_object_unref (pixbuf);
       g_object_unref (item);
       return;
     }
 
+  cc_appearance_item_load (item, NULL);
+
   /* insert the item into the liststore */
   gtk_list_store_insert_with_values (store, &iter, 0,
                                      0, pixbuf,
@@ -195,7 +262,7 @@
                          GAsyncResult *res,
                          gpointer user_data)
 {
-  BgPicturesSource *bg_source = BG_PICTURES_SOURCE (user_data);
+  BgPicturesSource *bg_source;
   CcAppearanceItem *item;
   GFileInputStream *stream;
   GError *error = NULL;
@@ -204,66 +271,78 @@
   stream = g_file_read_finish (G_FILE (source_object), res, &error);
   if (stream == NULL)
     {
-      char *filename;
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        {
+          char *filename = g_file_get_path (G_FILE (source_object));
+          g_warning ("Failed to load picture '%s': %s", filename, error->message);
+          g_free (filename);
+        }
 
-      filename = g_file_get_path (G_FILE (source_object));
-      g_warning ("Failed to load picture '%s': %s", filename, error->message);
-      g_free (filename);
       g_error_free (error);
       g_object_unref (item);
       return;
     }
 
+  /* since we were not cancelled, we can now cast user_data
+   * back to BgPicturesSource.
+   */
+  bg_source = BG_PICTURES_SOURCE (user_data);
+
   g_object_set_data (G_OBJECT (stream), "item", item);
-
   gdk_pixbuf_new_from_stream_at_scale_async (G_INPUT_STREAM (stream),
                                              THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
                                              TRUE,
-                                             NULL,
+                                             bg_source->priv->cancellable,
                                              picture_scaled, bg_source);
   g_object_unref (stream);
 }
 
 static gboolean
+in_content_types (const char *content_type)
+{
+	guint i;
+	for (i = 0; content_types[i]; i++)
+		if (g_str_equal (content_types[i], content_type))
+			return TRUE;
+	return FALSE;
+}
+
+static gboolean
 add_single_file (BgPicturesSource *bg_source,
 		 GFile            *file,
 		 GFileInfo        *info,
 		 const char       *source_uri)
 {
   const gchar *content_type;
+  CcAppearanceItem *item;
+  char *uri;
 
   /* find png and jpeg files */
   content_type = g_file_info_get_content_type (info);
 
   if (!content_type)
     return FALSE;
-
-  if (g_str_equal ("image/png", content_type) ||
-      g_str_equal ("image/jpeg", content_type) ||
-      g_str_equal ("image/svg+xml", content_type))
-    {
-      CcAppearanceItem *item;
-      char *uri;
-
-      /* create a new CcAppearanceItem */
-      uri = g_file_get_uri (file);
-      item = cc_appearance_item_new (uri);
-      g_free (uri);
-      g_object_set (G_OBJECT (item),
-		    "flags", CC_APPEARANCE_ITEM_HAS_URI | CC_APPEARANCE_ITEM_HAS_SHADING,
-		    "shading", G_DESKTOP_BACKGROUND_SHADING_SOLID,
-		    "placement", G_DESKTOP_BACKGROUND_STYLE_ZOOM,
-		    NULL);
-      if (source_uri != NULL && !g_file_is_native (file))
-        g_object_set (G_OBJECT (item), "source-url", source_uri, NULL);
-
-      g_object_set_data (G_OBJECT (file), "item", item);
-      g_file_read_async (file, 0, NULL, picture_opened_for_read, bg_source);
-      g_object_unref (file);
-      return TRUE;
-    }
-
-  return FALSE;
+  if (!in_content_types (content_type))
+    return FALSE;
+
+  /* create a new CcAppearanceItem */
+  uri = g_file_get_uri (file);
+  item = cc_appearance_item_new (uri);
+  g_free (uri);
+  g_object_set (G_OBJECT (item),
+		"flags", CC_APPEARANCE_ITEM_HAS_URI | CC_APPEARANCE_ITEM_HAS_SHADING,
+		"shading", G_DESKTOP_BACKGROUND_SHADING_SOLID,
+		"placement", G_DESKTOP_BACKGROUND_STYLE_ZOOM,
+		NULL);
+  if (source_uri != NULL && !g_file_is_native (file))
+    g_object_set (G_OBJECT (item), "source-url", source_uri, NULL);
+
+  g_object_set_data (G_OBJECT (file), "item", item);
+  g_file_read_async (file, G_PRIORITY_DEFAULT,
+                     bg_source->priv->cancellable,
+                     picture_opened_for_read, bg_source);
+  g_object_unref (file);
+  return TRUE;
 }
 
 gboolean
@@ -504,3 +583,8 @@
   return g_object_new (BG_TYPE_PICTURES_SOURCE, NULL);
 }
 
+const char * const *
+bg_pictures_get_support_content_types (void)
+{
+	return content_types;
+}

=== modified file 'panels/appearance/bg-pictures-source.h'
--- panels/appearance/bg-pictures-source.h	2013-12-02 02:45:53 +0000
+++ panels/appearance/bg-pictures-source.h	2014-03-03 10:09:16 +0000
@@ -79,6 +79,8 @@
 gboolean          bg_pictures_source_is_known       (BgPicturesSource *bg_source,
 						     const char       *uri);
 
+const char * const * bg_pictures_get_support_content_types (void);
+
 G_END_DECLS
 
 #endif /* _BG_PICTURES_SOURCE_H */

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2013-12-02 02:45:53 +0000
+++ panels/appearance/cc-appearance-panel.c	2014-03-03 10:09:16 +0000
@@ -74,6 +74,7 @@
   GSettings *unity_settings;
   GSettings *compizcore_settings;
   GSettings *unity_own_settings;
+  GSettings *unity_launcher_settings;
 
   GnomeDesktopThumbnailFactory *thumb_factory;
 
@@ -112,11 +113,13 @@
 #define COMPIZCORE_HSIZE_KEY "hsize"
 #define COMPIZCORE_VSIZE_KEY "vsize"
 
-#define UNITY_OWN_GSETTINGS_SCHEMA "com.canonical.Unity.Launcher"
+#define UNITY_OWN_GSETTINGS_SCHEMA "com.canonical.Unity"
+#define UNITY_LAUNCHER_GSETTINGS_SCHEMA "com.canonical.Unity.Launcher"
 #define UNITY_FAVORITES_KEY "favorites"
+#define UNITY_INTEGRATED_MENUS_KEY "integrated-menus"
 #define SHOW_DESKTOP_UNITY_FAVORITE_STR "unity://desktop-icon"
 
-#define MIN_ICONSIZE 32.0
+#define MIN_ICONSIZE 16.0
 #define MAX_ICONSIZE 64.0
 
 #define MIN_LAUNCHER_SENSIVITY 0.2
@@ -233,10 +236,10 @@
       priv->compizcore_settings = NULL;
     }
 
-  if (priv->unity_own_settings)
+  if (priv->unity_launcher_settings)
     {
-      g_object_unref (priv->unity_own_settings);
-      priv->unity_own_settings = NULL;
+      g_object_unref (priv->unity_launcher_settings);
+      priv->unity_launcher_settings = NULL;
     }
 
   if (priv->copy_cancellable)
@@ -411,7 +414,7 @@
 
   if (priv->current_background)
     {
-      GdkColor pcolor, scolor;
+      GdkRGBA pcolor, scolor;
       const char* bgsize = NULL;
 
       markup = g_strdup_printf ("<i>%s</i>", cc_appearance_item_get_name (priv->current_background));
@@ -428,11 +431,11 @@
       else
           gtk_label_set_text (GTK_LABEL (WID ("size_label")), "");
 
-      gdk_color_parse (cc_appearance_item_get_pcolor (priv->current_background), &pcolor);
-      gdk_color_parse (cc_appearance_item_get_scolor (priv->current_background), &scolor);
+      gdk_rgba_parse (&pcolor, cc_appearance_item_get_pcolor (priv->current_background));
+      gdk_rgba_parse (&scolor, cc_appearance_item_get_scolor (priv->current_background));
 
-      gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-pcolor")), &pcolor);
-      gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-scolor")), &scolor);
+      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-pcolor")), &pcolor);
+      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-scolor")), &scolor);
 
       select_style (GTK_COMBO_BOX (WID ("style-combobox")),
                     cc_appearance_item_get_placement (priv->current_background));
@@ -869,20 +872,30 @@
   update_preview (priv, NULL);
 }
 
+/* Convert RGBA to the old GdkColor string format for backwards compatibility */
+static gchar *
+rgba_to_string (GdkRGBA *color)
+{
+    return g_strdup_printf ("#%04x%04x%04x",
+                            (int)(color->red * 65535. + 0.5),
+                            (int)(color->green * 65535. + 0.5),
+                            (int)(color->blue * 65535. + 0.5));
+}
+
 static void
 color_changed_cb (GtkColorButton    *button,
                   CcAppearancePanel *panel)
 {
   CcAppearancePanelPrivate *priv = panel->priv;
-  GdkColor color;
+  GdkRGBA color;
   gchar *value;
   gboolean is_pcolor = FALSE;
 
-  gtk_color_button_get_color (button, &color);
+  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
   if (WID ("style-pcolor") == GTK_WIDGET (button))
     is_pcolor = TRUE;
 
-  value = gdk_color_to_string (&color);
+  value = rgba_to_string (&color);
 
   if (priv->current_background)
     {
@@ -905,17 +918,17 @@
                      CcAppearancePanel *panel)
 {
   CcAppearancePanelPrivate *priv = panel->priv;
-  GdkColor pcolor, scolor;
+  GdkRGBA pcolor, scolor;
   char *new_pcolor, *new_scolor;
 
-  gtk_color_button_get_color (GTK_COLOR_BUTTON (WID ("style-pcolor")), &pcolor);
-  gtk_color_button_get_color (GTK_COLOR_BUTTON (WID ("style-scolor")), &scolor);
-
-  gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-scolor")), &pcolor);
-  gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-pcolor")), &scolor);
-
-  new_pcolor = gdk_color_to_string (&scolor);
-  new_scolor = gdk_color_to_string (&pcolor);
+  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (WID ("style-pcolor")), &pcolor);
+  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (WID ("style-scolor")), &scolor);
+
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-scolor")), &pcolor);
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-pcolor")), &scolor);
+
+  new_pcolor = rgba_to_string (&scolor);
+  new_scolor = rgba_to_string (&pcolor);
 
   g_object_set (priv->current_background,
                 "primary-color", new_pcolor,
@@ -1048,8 +1061,8 @@
 	}
       else
         {
-          gtk_image_set_from_stock (GTK_IMAGE (preview),
-				    GTK_STOCK_DIALOG_QUESTION,
+          gtk_image_set_from_icon_name (GTK_IMAGE (preview),
+				    "dialog-question",
 				    GTK_ICON_SIZE_DIALOG);
 	}
 
@@ -1073,17 +1086,21 @@
   GtkWidget *preview;
   GtkFileFilter *filter;
   CcAppearancePanelPrivate *priv;
+  const char * const * content_types;
+  guint i;
 
   priv = panel->priv;
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/*");
+  content_types = bg_pictures_get_support_content_types ();
+  for (i = 0; content_types[i] != NULL; i++)
+    gtk_file_filter_add_mime_type (filter, content_types[i]);
 
   chooser = gtk_file_chooser_dialog_new (_("Browse for more pictures"),
 					 GTK_WINDOW (gtk_widget_get_toplevel (WID ("appearance-panel"))),
 					 GTK_FILE_CHOOSER_ACTION_OPEN,
-					 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+					 _("_Cancel"), GTK_RESPONSE_CANCEL,
+					 _("_Open"), GTK_RESPONSE_ACCEPT,
 					 NULL);
   gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (chooser), filter);
   gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
@@ -1616,7 +1633,7 @@
   gchar **favorites = NULL;
   gboolean show_desktop_found = FALSE;
 
-  favorites = g_settings_get_strv (priv->unity_own_settings, UNITY_FAVORITES_KEY);
+  favorites = g_settings_get_strv (priv->unity_launcher_settings, UNITY_FAVORITES_KEY);
   while (*favorites != NULL)
     {
       if (g_strcmp0 (*favorites, SHOW_DESKTOP_UNITY_FAVORITE_STR) == 0)
@@ -1648,7 +1665,7 @@
   GPtrArray* newfavorites = g_ptr_array_new ();
   gboolean show_desktop_in_array = FALSE;
 
-  favorites = g_settings_get_strv (priv->unity_own_settings, UNITY_FAVORITES_KEY);
+  favorites = g_settings_get_strv (priv->unity_launcher_settings, UNITY_FAVORITES_KEY);
   if (gtk_toggle_button_get_active (button))
     {
 
@@ -1687,11 +1704,71 @@
         }
     }
   g_ptr_array_add (newfavorites, NULL);
-  g_settings_set_strv (priv->unity_own_settings, UNITY_FAVORITES_KEY, (const gchar **)newfavorites->pdata);
+  g_settings_set_strv (priv->unity_launcher_settings, UNITY_FAVORITES_KEY, (const gchar **)newfavorites->pdata);
   g_ptr_array_free (newfavorites, TRUE);
   
 }
 
+static gboolean
+unity_own_setting_exists (CcAppearancePanel *self, const gchar* key_name)
+{
+  if (!self->priv->unity_own_settings)
+    return FALSE;
+
+  gchar** unity_keys;
+  gchar** key;
+
+  unity_keys = g_settings_list_keys (self->priv->unity_own_settings);
+
+  for (key = unity_keys; *key; ++key)
+    {
+      if (g_strcmp0 (*key, key_name) == 0)
+        return TRUE;
+    }
+
+  g_strfreev (unity_keys);
+  return FALSE;
+}
+
+static void
+menulocation_widget_refresh (CcAppearancePanel *self)
+{
+  CcAppearancePanelPrivate *priv = self->priv;
+
+  gboolean has_setting = unity_own_setting_exists (self, UNITY_INTEGRATED_MENUS_KEY);
+  gtk_widget_set_visible (WID ("unity_menus_box"), has_setting);
+  gtk_widget_set_visible (WID ("menu_separator"), has_setting);
+
+  if (!has_setting)
+    return;
+
+  gboolean value = g_settings_get_boolean (priv->unity_own_settings, UNITY_INTEGRATED_MENUS_KEY);
+
+  if (value)
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("unity_local_menus")), TRUE);
+  else
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("unity_global_menus")), TRUE);
+}
+
+static void
+ext_menulocation_changed_callback (GSettings* settings,
+                                   guint key,
+                                   gpointer user_data)
+{
+  menulocation_widget_refresh (CC_APPEARANCE_PANEL (user_data));
+}
+
+static void
+on_menulocation_changed (GtkToggleButton *button, gpointer user_data)
+{
+  CcAppearancePanel *self = CC_APPEARANCE_PANEL (user_data);
+  CcAppearancePanelPrivate *priv = self->priv;
+  gboolean local_menus = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("unity_local_menus")));
+
+  g_settings_set_boolean (priv->unity_own_settings, UNITY_INTEGRATED_MENUS_KEY, local_menus);
+  menulocation_widget_refresh (self);
+}
+
 static void
 on_restore_defaults_page2_clicked (GtkButton *button, gpointer user_data)
 {
@@ -1704,6 +1781,9 @@
   g_settings_reset (priv->unity_settings, UNITY_LAUNCHERREVEAL_KEY);
   g_settings_reset (priv->compizcore_settings, COMPIZCORE_HSIZE_KEY);
   g_settings_reset (priv->compizcore_settings, COMPIZCORE_VSIZE_KEY);
+
+  if (unity_own_setting_exists (self, UNITY_INTEGRATED_MENUS_KEY))
+    g_settings_reset (priv->unity_own_settings, UNITY_INTEGRATED_MENUS_KEY);
 }
 
 /* <hacks> */
@@ -1753,26 +1833,37 @@
   GtkAdjustment* launcher_sensitivity_adj;
   GtkScale* iconsize_scale;
   GtkScale* launcher_sensitivity_scale;
-  const gchar * const *schemas;
-
-  schemas = g_settings_list_schemas ();
-  while (*schemas != NULL)
-    {
-      if (g_strcmp0 (*schemas, UNITY_OWN_GSETTINGS_SCHEMA) == 0)
-          priv->unity_own_settings = g_settings_new (UNITY_OWN_GSETTINGS_SCHEMA);
-      schemas++;
-    }
-  schemas = g_settings_list_relocatable_schemas ();
-  while (*schemas != NULL)
-    {
-      if (g_strcmp0 (*schemas, UNITY_GSETTINGS_SCHEMA) == 0)
-          priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, UNITY_GSETTINGS_PATH);
-      if (g_strcmp0 (*schemas, COMPIZCORE_GSETTINGS_SCHEMA) == 0)
-          priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, COMPIZCORE_GSETTINGS_PATH);
-      schemas++;
-    }
-
-  if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings)
+  GSettingsSchema *schema;
+  GSettingsSchemaSource* source;
+
+  source = g_settings_schema_source_get_default ();
+
+  schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
+  if (schema)
+    {
+      priv->unity_own_settings = g_settings_new (UNITY_OWN_GSETTINGS_SCHEMA);
+      g_settings_schema_unref (schema);
+    }
+  schema = g_settings_schema_source_lookup (source, UNITY_LAUNCHER_GSETTINGS_SCHEMA, TRUE);
+  if (schema)
+    {
+      priv->unity_launcher_settings = g_settings_new (UNITY_LAUNCHER_GSETTINGS_SCHEMA);
+      g_object_unref (schema);
+    }
+  schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);
+  if (schema)
+    {
+      priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, UNITY_GSETTINGS_PATH);
+      g_settings_schema_unref (schema);
+    }
+  schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);
+  if (schema)
+    {
+      priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, COMPIZCORE_GSETTINGS_PATH);
+      g_settings_schema_unref (schema);
+    }
+
+  if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings || !priv->unity_launcher_settings)
     return;
 
   /* Icon size change */
@@ -1832,12 +1923,21 @@
   enable_workspaces_widget_refresh (self);
 
   /* Enabling show desktop icon */
-  g_signal_connect (priv->unity_own_settings, "changed::" UNITY_FAVORITES_KEY,
+  g_signal_connect (priv->unity_launcher_settings, "changed::" UNITY_FAVORITES_KEY,
                     G_CALLBACK (ext_enableshowdesktop_changed_callback), self);
   g_signal_connect (WID ("check_showdesktop_in_launcher"), "toggled",
                      G_CALLBACK (on_enable_showdesktop_changed), self);
   enable_showdesktop_widget_refresh (self);
 
+  /* Menu location */
+  g_signal_connect (priv->unity_own_settings, "changed::" UNITY_INTEGRATED_MENUS_KEY,
+                    G_CALLBACK (ext_menulocation_changed_callback), self);
+  g_signal_connect (WID ("unity_global_menus"), "toggled",
+                     G_CALLBACK (on_menulocation_changed), self);
+  g_signal_connect (WID ("unity_local_menus"), "toggled",
+                     G_CALLBACK (on_menulocation_changed), self);
+  menulocation_widget_refresh (self);
+
   /* Restore defaut on second page */
   g_signal_connect (WID ("button-restore-unitybehavior"), "clicked",
                     G_CALLBACK (on_restore_defaults_page2_clicked), self);

=== modified file 'panels/bluetooth/Makefile.am'
--- panels/bluetooth/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/bluetooth/Makefile.am	2014-03-03 10:09:16 +0000
@@ -8,26 +8,33 @@
 	$(PANEL_CFLAGS)					\
 	$(BLUETOOTH_CFLAGS)				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DPKGDATADIR="\"$(pkgdatadir)\""		\
 	$(NULL)
 
+BUILT_SOURCES =				\
+	cc-bluetooth-resources.h	\
+	cc-bluetooth-resources.c
+
 libbluetooth_la_SOURCES =			\
+	$(BUILT_SOURCES)			\
 	cc-bluetooth-panel.c			\
 	cc-bluetooth-panel.h
 
 libbluetooth_la_LIBADD = $(PANEL_LIBS) $(BLUETOOTH_LIBS)
 libbluetooth_la_LDFLAGS = $(PANEL_LDFLAGS)
 
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/bluetooth.gresource.xml)
+cc-bluetooth-resources.c: bluetooth.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_bluetooth $<
+cc-bluetooth-resources.h: bluetooth.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_bluetooth $<
+
 desktopdir = $(datadir)/applications
 desktop_in_in_files = untiy-bluetooth-panel.desktop.in.in
 desktop_in_files = unity-bluetooth-panel.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-ui_DATA = bluetooth.ui
-uidir = $(pkgdatadir)
-
-CLEANFILES = $(desktop_DATA)
-EXTRA_DIST = $(man_MANS) $(desktop_in_in_files) $(ui_DATA)
+CLEANFILES = $(desktop_DATA) $(BUILT_SOURCES)
+EXTRA_DIST = $(man_MANS) $(desktop_in_in_files) $(resource_files) bluetooth.gresource.xml
 
 -include $(top_srcdir)/git.mk

=== added file 'panels/bluetooth/bluetooth.gresource.xml'
--- panels/bluetooth/bluetooth.gresource.xml	1970-01-01 00:00:00 +0000
+++ panels/bluetooth/bluetooth.gresource.xml	2014-03-03 10:09:16 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/control-center/bluetooth">
+    <file preprocess="xml-stripblanks">bluetooth.ui</file>
+  </gresource>
+</gresources>

=== modified file 'panels/bluetooth/bluetooth.ui'
--- panels/bluetooth/bluetooth.ui	2012-11-10 19:29:03 +0000
+++ panels/bluetooth/bluetooth.ui	2014-03-03 10:09:16 +0000
@@ -121,6 +121,8 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">6</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="show_tabs">False</property>
             <property name="show_border">False</property>
             <child>
@@ -524,7 +526,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="send_button">
-                                    <property name="label" translatable="yes">Send Files...</property>
+                                    <property name="label" translatable="yes">Send Files…</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="use_action_appearance">False</property>
@@ -552,7 +554,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="browse_button">
-                                    <property name="label" translatable="yes">Browse Files...</property>
+                                    <property name="label" translatable="yes">Browse Files…</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="use_action_appearance">False</property>
@@ -669,6 +671,26 @@
           </packing>
         </child>
         <child>
+          <object class="GtkCheckButton" id="menubar_visibility_toggle">
+            <property name="label" translatable="yes">_Show Bluetooth status in the menu bar</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="margin_top">6</property>
+            <property name="use_action_appearance">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkBox" id="box_vis">
             <property name="visible">True</property>
             <property name="can_focus">False</property>

=== modified file 'panels/bluetooth/cc-bluetooth-panel.c'
--- panels/bluetooth/cc-bluetooth-panel.c	2013-11-28 04:32:11 +0000
+++ panels/bluetooth/cc-bluetooth-panel.c	2014-03-03 10:09:16 +0000
@@ -29,6 +29,7 @@
 #include <shell/cc-shell.h>
 
 #include "cc-bluetooth-panel.h"
+#include "cc-bluetooth-resources.h"
 
 #include <bluetooth-client.h>
 #include <bluetooth-utils.h>
@@ -55,6 +56,8 @@
 	BluetoothKillswitch *killswitch;
 	gboolean             debug;
 	GHashTable          *connecting_devices;
+	GCancellable        *cancellable;
+	GSettings           *indicator_settings;
 };
 
 static void cc_bluetooth_panel_finalize (GObject *object);
@@ -100,9 +103,13 @@
 	bluetooth_plugin_manager_cleanup ();
 
 	self = CC_BLUETOOTH_PANEL (object);
+	g_cancellable_cancel (self->priv->cancellable);
+	g_clear_object (&self->priv->cancellable);
+
 	g_clear_object (&self->priv->builder);
 	g_clear_object (&self->priv->killswitch);
 	g_clear_object (&self->priv->client);
+	g_clear_object (&self->priv->indicator_settings);
 
 	g_clear_pointer (&self->priv->connecting_devices, g_hash_table_destroy);
 	g_clear_pointer (&self->priv->selected_bdaddr, g_free);
@@ -163,10 +170,13 @@
 	CcBluetoothPanel *self;
 	char *bdaddr;
 	gboolean success;
+	GError *error = NULL;
 	ConnectData *data = (ConnectData *) user_data;
 
 	success = bluetooth_client_connect_service_finish (BLUETOOTH_CLIENT (source_object),
-							   res, NULL);
+							   res, &error);
+	if (!success && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		goto out;
 
 	self = data->self;
 
@@ -185,7 +195,9 @@
 	remove_connecting (self, data->bdaddr);
 
 	g_free (bdaddr);
-	g_object_unref (data->self);
+
+out:
+	g_clear_error (&error);
 	g_free (data->bdaddr);
 	g_free (data);
 }
@@ -219,12 +231,12 @@
 
 	data = g_new0 (ConnectData, 1);
 	data->bdaddr = bdaddr;
-	data->self = g_object_ref (self);
+	data->self = self;
 
 	bluetooth_client_connect_service (self->priv->client,
 					  proxy,
 					  gtk_switch_get_active (button),
-					  NULL,
+					  self->priv->cancellable,
 					  connect_done,
 					  data);
 
@@ -640,8 +652,8 @@
 		      _("If you remove the device, you will have to set it up again before next use."),
 		      NULL);
 
-	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_REMOVE, GTK_RESPONSE_ACCEPT);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Remove"), GTK_RESPONSE_ACCEPT);
 
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -796,8 +808,10 @@
 	GtkStyleContext *context;
 
 	self->priv = BLUETOOTH_PANEL_PRIVATE (self);
+	g_resources_register (cc_bluetooth_get_resource ());
 
 	bluetooth_plugin_manager_init ();
+	self->priv->cancellable = g_cancellable_new ();
 	self->priv->killswitch = bluetooth_killswitch_new ();
 	self->priv->client = bluetooth_client_new ();
 	self->priv->connecting_devices = g_hash_table_new_full (g_str_hash,
@@ -808,11 +822,11 @@
 
 	self->priv->builder = gtk_builder_new ();
 	gtk_builder_set_translation_domain (self->priv->builder, GETTEXT_PACKAGE);
-	gtk_builder_add_from_file (self->priv->builder,
-				   PKGDATADIR "/bluetooth.ui",
-				   &error);
+	gtk_builder_add_from_resource (self->priv->builder,
+                                       "/org/gnome/control-center/bluetooth/bluetooth.ui",
+                                       &error);
 	if (error != NULL) {
-		g_warning ("Failed to load '%s': %s", PKGDATADIR "/bluetooth.ui", error->message);
+		g_warning ("Could not load ui: %s", error->message);
 		g_error_free (error);
 		return;
 	}
@@ -896,6 +910,12 @@
 			  G_CALLBACK (killswitch_changed), self);
 	cc_bluetooth_panel_update_power (self);
 
+	/* Set up the menubar visibility toggle */
+	self->priv->indicator_settings = g_settings_new ("com.canonical.indicator.bluetooth");
+	g_settings_bind (self->priv->indicator_settings, "visible",
+	                 WID("menubar_visibility_toggle"), "active",
+	                 G_SETTINGS_BIND_DEFAULT);
+
 	gtk_widget_show_all (GTK_WIDGET (self));
 }
 

=== modified file 'panels/color/cc-color-panel.c'
--- panels/color/cc-color-panel.c	2013-11-28 04:35:28 +0000
+++ panels/color/cc-color-panel.c	2014-03-03 10:09:16 +0000
@@ -227,7 +227,7 @@
   /* TRANSLATORS: an ICC profile is a file containing colorspace data */
   dialog = gtk_file_chooser_dialog_new (_("Select ICC Profile File"), window,
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
                                         _("_Import"), GTK_RESPONSE_ACCEPT,
                                         NULL);
   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dialog), g_get_home_dir ());

=== modified file 'panels/common/list-languages.c'
--- panels/common/list-languages.c	2012-10-01 07:32:18 +0000
+++ panels/common/list-languages.c	2014-03-03 10:09:16 +0000
@@ -14,8 +14,6 @@
 	setlocale (LC_ALL, NULL);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-	g_type_init ();
-
 	if (argc > 1) {
 		guint i;
 		for (i = 1; i < argc; i++) {

=== added directory 'panels/datetime'
=== added file 'panels/datetime/Makefile.am'
--- panels/datetime/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/datetime/Makefile.am	2014-03-03 10:09:16 +0000
@@ -0,0 +1,58 @@
+# This is used in PANEL_CFLAGS
+cappletname = datetime
+
+uidir = $(pkgdatadir)/ui/datetime
+dist_ui_DATA = datetime-dialog.ui
+
+icons16dir = $(datadir)/icons/hicolor/16x16/apps
+dist_icons16_DATA = icons/16x16/unity-datetime-panel.png
+icons22dir = $(datadir)/icons/hicolor/22x22/apps
+dist_icons22_DATA = icons/22x22/unity-datetime-panel.png
+icons32dir = $(datadir)/icons/hicolor/32x32/apps
+dist_icons32_DATA = icons/32x32/unity-datetime-panel.png
+icons48dir = $(datadir)/icons/hicolor/48x48/apps
+dist_icons48_DATA = icons/48x48/unity-datetime-panel.png
+icons256dir = $(datadir)/icons/hicolor/256x256/apps
+dist_icons256_DATA = icons/256x256/unity-datetime-panel.png
+iconsscalabledir = $(datadir)/icons/hicolor/scalable/apps
+dist_iconsscalable_DATA = icons/scalable/unity-datetime-panel.svg
+
+INCLUDES =						\
+	$(PANEL_CFLAGS)					\
+	$(DATETIME_PANEL_CFLAGS) \
+	-DLOCALEDIR="\"$(datadir)/locale\"" \
+	-DPKGDATADIR="\"$(pkgdatadir)\"" \
+	$(NULL)
+
+ccpanelsdir = $(PANELS_DIR)
+ccpanels_LTLIBRARIES = libdatetime.la
+
+libdatetime_la_SOURCES = \
+	datetime-prefs.c \
+	datetime-prefs-locations.c \
+	datetime-prefs-locations.h \
+	settings-shared.h \
+	utils.c \
+	utils.h
+
+libdatetime_la_LIBADD = $(PANEL_LIBS) $(DATETIME_PANEL_LIBS)
+libdatetime_la_LDFLAGS = $(PANEL_LDFLAGS)
+
+polkitdir = $(datadir)/polkit-1/actions
+polkit_in_files = com.canonical.controlcenter.datetime.policy.in
+
+@INTLTOOL_POLICY_RULE@
+polkit_DATA = $(polkit_in_files:.policy.in=.policy)
+
+@INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = unity-datetime-panel.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+CLEANFILES = $(desktop_in_files) $(desktop_DATA)
+
+EXTRA_DIST =				\
+	$(polkit_in_files)
+
+-include $(top_srcdir)/git.mk

=== added file 'panels/datetime/com.canonical.controlcenter.datetime.policy.in'
--- panels/datetime/com.canonical.controlcenter.datetime.policy.in	1970-01-01 00:00:00 +0000
+++ panels/datetime/com.canonical.controlcenter.datetime.policy.in	2014-03-03 10:09:16 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+  <vendor>The GNOME Project</vendor>
+  <vendor_url>http://www.gnome.org/</vendor_url>
+
+  <action id="com.canonical.controlcenter.datetime.configure">
+    <_description>Change system time and date settings</_description>
+    <_message>To change time or date settings, you need to authenticate.</_message>
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.imply">org.freedesktop.timedate1.set-time org.freedesktop.timedate1.set-timezone org.freedesktop.timedate1.set-local-rtc org.freedesktop.timedate1.set-ntp</annotate>
+  </action>
+
+</policyconfig>

=== added file 'panels/datetime/datetime-dialog.ui'
--- panels/datetime/datetime-dialog.ui	1970-01-01 00:00:00 +0000
+++ panels/datetime/datetime-dialog.ui	2014-03-03 10:09:16 +0000
@@ -0,0 +1,864 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.24"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="dateAdjustment">
+    <property name="upper">1.8446744073709552e+19</property>
+    <property name="step_increment">86400</property>
+    <property name="page_increment">864000</property>
+  </object>
+  <object class="GtkWindow" id="locationsDialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Locations</property>
+    <property name="default_width">300</property>
+    <property name="default_height">200</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <object class="GtkTreeView" id="locationsView">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">locationsStore</property>
+                <property name="headers_visible">False</property>
+                <property name="headers_clickable">False</property>
+                <property name="reorderable">True</property>
+                <property name="search_column">0</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHSeparator" id="hseparator1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">4</property>
+            <child>
+              <object class="GtkButton" id="addButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="addButton-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes">Add a Location…</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImage" id="addImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-add</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="removeButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="removeButton-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes">Remove This Location</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImage" id="removeImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-remove</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="sortByNameButton">
+                <property name="label" translatable="yes">Sort by _Name</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+                <accelerator key="n" signal="clicked" modifiers="GDK_MOD1_MASK"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">6</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="sortByTimeButton">
+                <property name="label" translatable="yes">Sort by _Time</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+                <accelerator key="t" signal="clicked" modifiers="GDK_MOD1_MASK"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">4</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkListStore" id="locationsStore">
+    <columns>
+      <!-- column-name Location -->
+      <column type="gchararray"/>
+      <!-- column-name Time -->
+      <column type="gchararray"/>
+      <!-- column-name Zone -->
+      <column type="gchararray"/>
+      <!-- column-name Visible Name -->
+      <column type="gchararray"/>
+      <!-- column-name Icon -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkAdjustment" id="timeAdjustment">
+    <property name="upper">1.8446744073709552e+19</property>
+    <property name="step_increment">60</property>
+    <property name="page_increment">3600</property>
+  </object>
+  <object class="GtkEventBox" id="timeDatePanel">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <child>
+      <object class="GtkNotebook" id="notebook1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <child>
+          <object class="GtkVBox" id="timeDateBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">12</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkVBox" id="timeDateOptions">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkVBox" id="vbox6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkAspectFrame" id="mapBox">
+                        <property name="height_request">265</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="label5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">_Location:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">timezoneEntry</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="timezoneEntry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTable" id="table1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">6</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkRadioButton" id="manualTimeRadio">
+                            <property name="label" translatable="yes">_Manually</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="automaticTimeRadio">
+                            <property name="label" translatable="yes">_Automatically from the Internet</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">manualTimeRadio</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Set the time:</property>
+                      </object>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="manualOptions">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox8">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkSpinButton" id="timeSpinner">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">•</property>
+                                <property name="width_chars">11</property>
+                                <property name="xalign">1</property>
+                                <property name="invisible_char_set">True</property>
+                                <property name="adjustment">timeAdjustment</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox9">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label10">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Date:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">dateSpinner</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="dateSpinner">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">•</property>
+                                <property name="width_chars">11</property>
+                                <property name="xalign">1</property>
+                                <property name="invisible_char_set">True</property>
+                                <property name="adjustment">dateAdjustment</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label11">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Tim_e:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">timeSpinner</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xpad">1</property>
+            <property name="label" translatable="yes">_Time &amp; Date</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="yalign">0</property>
+            <property name="yscale">0</property>
+            <child>
+              <object class="GtkVBox" id="clockBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkCheckButton" id="showClockCheck">
+                    <property name="label" translatable="yes">_Show a clock in the menu bar</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="clockOptions">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="homogeneous">True</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="label3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">In the clock, show:</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="showWeekdayCheck">
+                            <property name="label" translatable="yes">_Weekday</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="showDateAndMonthCheck">
+                            <property name="label" translatable="yes">_Date and month</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="showYearAlignment">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="yscale">0</property>
+                            <property name="left_padding">24</property>
+                            <child>
+                              <object class="GtkVBox" id="showYearVbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="showYearCheck">
+                                    <property name="label" translatable="yes">_Year</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkRadioButton" id="show12HourRadio">
+                                <property name="label" translatable="yes">_12-hour time</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="show24HourRadio">
+                                <property name="label" translatable="yes">_24-hour time</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">show12HourRadio</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="showSecondsCheck">
+                            <property name="label" translatable="yes">Seco_nds</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">5</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">In the clock’s menu, show:</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="showCalendarCheck">
+                            <property name="label" translatable="yes">_Monthly calendar</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="calendarOptions">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="yscale">0</property>
+                            <property name="left_padding">24</property>
+                            <child>
+                              <object class="GtkVBox" id="vbox4">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="includeWeekNumbersCheck">
+                                    <property name="label" translatable="yes">Include week num_bers</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="showEventsCheck">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <child>
+                              <object class="GtkLabel" id="label12">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Coming _events from Evolution Calendar</property>
+                                <property name="use_underline">True</property>
+                                <property name="wrap">True</property>
+                                <property name="mnemonic_widget">showEventsCheck</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="showDetectedCheck">
+                            <property name="label" translatable="yes">Time in _auto-detected location</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="showLocationsCheck">
+                            <property name="label" translatable="yes">Time in _other locations</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="xscale">0</property>
+                            <property name="yscale">0</property>
+                            <property name="left_padding">24</property>
+                            <child>
+                              <object class="GtkButton" id="locationsButton">
+                                <property name="label" translatable="yes">Choose _Locations…</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">6</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">_Clock</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkSizeGroup" id="timeSizeGroup">
+    <widgets>
+      <widget name="label5"/>
+      <widget name="label9"/>
+      <widget name="label11"/>
+    </widgets>
+  </object>
+</interface>

=== added file 'panels/datetime/datetime-prefs-locations.c'
--- panels/datetime/datetime-prefs-locations.c	1970-01-01 00:00:00 +0000
+++ panels/datetime/datetime-prefs-locations.c	2014-03-03 10:09:16 +0000
@@ -0,0 +1,681 @@
+/* -*- Mode: C; coding: utf-8; indent-tabs-mode: nil; tab-width: 2 -*-
+
+A dialog for setting time and date preferences.
+
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Michael Terry <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <time.h> /* time_t */
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+#include <timezonemap/timezone-completion.h>
+
+#include "datetime-prefs-locations.h"
+#include "settings-shared.h"
+#include "utils.h"
+
+#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/ui/datetime/datetime-dialog.ui"
+
+#define COL_NAME         0
+#define COL_TIME         1
+#define COL_ZONE         2
+#define COL_VISIBLE_NAME 3
+#define COL_ICON         4
+
+static gboolean update_times (GtkWidget * dlg);
+static void save_when_idle (GtkWidget * dlg);
+
+/***
+**** Sorting
+***/
+
+/**
+ * A temporary struct used for sorting
+ */
+struct TimeLocation
+{
+  gchar * collated_name;
+  gint pos;
+  gint32 offset;
+};
+
+static struct TimeLocation*
+time_location_new (const char * zone, const char * name, int pos, time_t now)
+{
+  struct TimeLocation * loc = g_new (struct TimeLocation, 1);
+  GTimeZone * tz = g_time_zone_new (zone);
+  const gint interval = g_time_zone_find_interval (tz, G_TIME_TYPE_UNIVERSAL, now);
+  loc->offset = g_time_zone_get_offset (tz, interval);
+  loc->collated_name = g_utf8_collate_key (name, -1);
+  loc->pos = pos;
+  g_time_zone_unref (tz);
+  return loc;
+}
+
+static void
+time_location_free (struct TimeLocation * loc)
+{
+  g_free (loc->collated_name);
+  g_free (loc);
+}
+
+static GSList*
+time_location_array_new_from_model (GtkTreeModel * model)
+{
+  int pos = 0;
+  GtkTreeIter iter;
+  GSList * list = NULL;
+  const time_t now = time (NULL);
+
+  if (gtk_tree_model_get_iter_first (model, &iter)) do
+    {
+      gchar * zone = NULL;
+      gchar * name = NULL;
+
+      gtk_tree_model_get (model, &iter,
+                          COL_ZONE, &zone,
+                          COL_VISIBLE_NAME, &name,
+                          -1);
+
+      if (zone && name)
+        list = g_slist_prepend (list, time_location_new (zone, name, pos++, now));
+
+      g_free (name);
+      g_free (zone);
+    }
+  while (gtk_tree_model_iter_next (model, &iter));
+
+  return g_slist_reverse (list);
+}
+
+static void
+handle_sort(GtkWidget * button G_GNUC_UNUSED,
+            GtkTreeView * tree_view,
+            GCompareFunc compare)
+{
+  GtkTreeModel * model = gtk_tree_view_get_model (tree_view);
+  GSList * l;
+  GSList * list = g_slist_sort (time_location_array_new_from_model(model), compare);
+
+  gint i;
+  gint * reorder = g_new (gint, g_slist_length(list));
+  for (i=0, l=list; l!=NULL; l=l->next, i++)
+      reorder[i] = ((struct TimeLocation*)l->data)->pos;
+  gtk_list_store_reorder (GTK_LIST_STORE(model), reorder);
+
+  g_free (reorder);
+  g_slist_free_full (list, (GDestroyNotify)time_location_free);
+}
+
+static gint
+time_location_compare_by_name (gconstpointer ga, gconstpointer gb)
+{
+  const struct TimeLocation * a = ga;
+  const struct TimeLocation * b = gb;
+  int ret = g_strcmp0 (a->collated_name, b->collated_name); /* primary key */
+  if (!ret)
+    ret = a->offset - b->offset; /* secondary key */
+  return ret;
+}
+static void
+handle_sort_by_name (GtkWidget * button, GtkTreeView * tree_view)
+{
+  handle_sort (button, tree_view, time_location_compare_by_name);
+}
+
+static gint
+time_location_compare_by_time (gconstpointer ga, gconstpointer gb)
+{
+  const struct TimeLocation * a = ga;
+  const struct TimeLocation * b = gb;
+  int ret = a->offset - b->offset; /* primary key */
+  if (!ret)
+    ret = g_strcmp0 (a->collated_name, b->collated_name); /* secondary key */
+  return ret;
+}
+static void
+handle_sort_by_time (GtkWidget * button, GtkTreeView * tree_view)
+{
+  handle_sort (button, tree_view, time_location_compare_by_time);
+}
+
+static gboolean
+time_location_list_test_sorted (GSList * list, GCompareFunc compare)
+{
+  GSList * l;
+  for (l=list; l!=NULL && l->next!=NULL; l=l->next)
+    if (compare(l->data, l->next->data) > 0)
+      return FALSE;
+  return TRUE;
+}
+static void
+location_model_test_sorted (GtkTreeModel * model, gboolean * is_sorted_by_name, gboolean * is_sorted_by_time)
+{
+  GSList * list = time_location_array_new_from_model(model);
+  *is_sorted_by_name = time_location_list_test_sorted (list, time_location_compare_by_name);
+  *is_sorted_by_time = time_location_list_test_sorted (list, time_location_compare_by_time);
+  g_slist_free_full (list, (GDestroyNotify)time_location_free);
+}
+
+/***
+****
+***/
+
+static void
+handle_add (GtkWidget * button G_GNUC_UNUSED, GtkTreeView * tree)
+{
+  GtkListStore * store = GTK_LIST_STORE (gtk_tree_view_get_model (tree));
+
+  GtkTreeIter iter;
+  gtk_list_store_append (store, &iter);
+
+  GtkTreePath * path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
+  gtk_tree_view_set_cursor (tree, path, gtk_tree_view_get_column (tree, 0), TRUE);
+  gtk_tree_path_free (path);
+}
+
+static void
+handle_remove (GtkWidget * button G_GNUC_UNUSED, GtkTreeView * tree)
+{
+  GtkListStore * store = GTK_LIST_STORE (gtk_tree_view_get_model (tree));
+  GtkTreeSelection * selection = gtk_tree_view_get_selection (tree);
+
+  GList * paths = gtk_tree_selection_get_selected_rows (selection, NULL);
+
+  /* Convert all paths to iters so we can safely delete multiple paths.  For a
+     GtkListStore, iters persist past model changes. */
+  GList * tree_iters = NULL;
+  GList * iter;
+  for (iter = paths; iter; iter = iter->next) {
+    GtkTreeIter * tree_iter = g_new(GtkTreeIter, 1);
+    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (store), tree_iter, (GtkTreePath *)iter->data)) {
+      tree_iters = g_list_prepend (tree_iters, tree_iter);
+    }
+    gtk_tree_path_free (iter->data);
+  }
+  g_list_free (paths);
+  
+  // Find the next item to select
+  GtkTreeIter *last_selected = g_list_nth_data(tree_iters, 0);
+  GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL (store), last_selected);
+  GtkTreeIter titer;
+  if (!gtk_tree_model_get_iter(GTK_TREE_MODEL (store), &titer, path)) {
+    g_debug("Failed to get last selected iter from path");
+  	last_selected = NULL;
+  } else {
+	  if (!gtk_tree_model_iter_next(GTK_TREE_MODEL (store), &titer)) {
+	  	if (gtk_tree_path_prev(path)) {
+	  	  	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL (store), &titer, path)) {
+	  			g_debug("Failed to get iter from path");
+	  			last_selected = NULL;
+	  		} else {
+		  		last_selected = &titer;
+		  	}
+	  	} else {
+	  		g_debug("handle_remove: Failed to find another location to select (assume single selected)");
+	  		last_selected = NULL;
+	  	}
+	  } else {
+	  	g_debug("Got next item in model");
+		last_selected = &titer;
+	  }
+  }
+ 
+  if (last_selected) {
+	  gboolean clear = TRUE;
+	  path = gtk_tree_model_get_path(GTK_TREE_MODEL (store), last_selected);
+	  
+      // Step over the path to find an item which isn't in the delete list
+	  if (g_list_length(tree_iters) > 1) {
+		  for (iter = tree_iters; iter; iter = iter->next) {
+		  	GtkTreePath *ipath = gtk_tree_model_get_path(GTK_TREE_MODEL (store), (GtkTreeIter *)iter->data);
+		  	if (gtk_tree_path_compare(path, ipath) == 0) {
+		  		clear = FALSE;
+		  		break;
+		  	}
+		  }
+	  	  while (clear == FALSE) {
+			if (gtk_tree_path_prev(path)) {
+				clear = TRUE;
+		  	  	for (iter = tree_iters; iter; iter = iter->next) {
+		  			GtkTreePath *ipath = gtk_tree_model_get_path(GTK_TREE_MODEL (store), (GtkTreeIter *)iter->data);
+		  			if (gtk_tree_path_compare(path, ipath) == 0) {
+		  				clear = FALSE;
+		  				break;
+		  			}
+		  		}
+		  		if (clear) {
+			  		if (!gtk_tree_model_get_iter(GTK_TREE_MODEL (store), &titer, path)) {
+			  			g_debug("Failed to get iter from path");
+			  			last_selected = NULL;
+			  		} else {
+				  		last_selected = &titer;
+				  	}
+				}
+		  	} else {
+		  		last_selected = NULL;
+		  		break;
+		  	}
+		  }
+	  }
+  }
+  
+  /* Now delete each iterator */
+  for (iter = tree_iters; iter; iter = iter->next) {
+    gtk_list_store_remove (store, (GtkTreeIter *)iter->data);
+    g_free (iter->data);
+  }
+  g_list_free (tree_iters);
+  
+  if (last_selected)
+	  gtk_tree_selection_select_iter(selection, last_selected);
+}
+
+static void
+handle_edit (GtkCellRendererText * renderer G_GNUC_UNUSED,
+             gchar * path,
+             gchar * new_text,
+             GtkListStore * store)
+{
+  GtkTreeIter iter;
+
+  // Manual user edits are always wrong (unless they are undoing a previous
+  // edit), so we set the error icon here if needed.  Common way to get to
+  // this code path is to lose entry focus.
+  if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store), &iter, path)) {
+    gchar * name;
+    gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_NAME, &name, -1);
+    gboolean correct = g_strcmp0 (name, new_text) == 0;
+    g_free (name);
+
+    gtk_list_store_set (store, &iter,
+                        COL_VISIBLE_NAME, new_text,
+                        COL_ICON, correct ? NULL : "dialog-error",
+                        -1);
+  }
+}
+
+static gboolean
+timezone_selected (GtkEntryCompletion * widget, GtkTreeModel * model,
+                   GtkTreeIter * iter, GtkWidget * dlg)
+{
+  gchar * zone = NULL;
+  gchar * name = NULL;
+
+  gtk_tree_model_get (model, iter,
+                      CC_TIMEZONE_COMPLETION_ZONE, &zone,
+                      CC_TIMEZONE_COMPLETION_NAME, &name,
+                      -1);
+
+  /* if no explicit timezone, try to determine one from latlon */
+  if (!zone || !*zone)
+  {
+    gchar * strlat = NULL;
+    gchar * strlon = NULL;
+    gdouble lat = 0;
+    gdouble lon = 0;
+
+    gtk_tree_model_get (model, iter,
+                        CC_TIMEZONE_COMPLETION_LATITUDE, &strlat,
+                        CC_TIMEZONE_COMPLETION_LONGITUDE, &strlon,
+                        -1);
+
+    if (strlat && *strlat) lat = g_ascii_strtod(strlat, NULL);
+    if (strlon && *strlon) lon = g_ascii_strtod(strlon, NULL);
+
+    CcTimezoneMap * tzmap = CC_TIMEZONE_MAP (g_object_get_data (G_OBJECT (widget), "tzmap"));
+    g_free (zone);
+    zone = g_strdup (cc_timezone_map_get_timezone_at_coords (tzmap, lon, lat));
+
+    g_free (strlat);
+    g_free (strlon);
+  }
+
+  GtkListStore * store = GTK_LIST_STORE (g_object_get_data (G_OBJECT (widget), "store"));
+  GtkTreeIter * store_iter = (GtkTreeIter *)g_object_get_data (G_OBJECT (widget), "store_iter");
+  if (store != NULL && store_iter != NULL) {
+    gtk_list_store_set (store, store_iter,
+                        COL_VISIBLE_NAME, name,
+                        COL_ICON, NULL,
+                        COL_NAME, name,
+                        COL_ZONE, zone, -1);
+  }
+
+  update_times (dlg);
+
+  /* cleanup */
+  g_free (name);
+  g_free (zone);
+
+  return FALSE; // Do normal action too
+}
+
+static gboolean
+query_tooltip (GtkTreeView * tree, gint x, gint y, gboolean keyboard_mode,
+               GtkTooltip * tooltip, GtkCellRenderer * cell)
+{
+  GtkTreeModel * model;
+  GtkTreeIter iter;
+  if (!gtk_tree_view_get_tooltip_context (tree, &x, &y, keyboard_mode,
+                                          &model, NULL, &iter))
+    return FALSE;
+
+  const gchar * icon;
+  gtk_tree_model_get (model, &iter, COL_ICON, &icon, -1);
+  if (icon == NULL)
+    return FALSE;
+
+  GtkTreeViewColumn * col = gtk_tree_view_get_column (tree, 0);
+  gtk_tree_view_set_tooltip_cell (tree, tooltip, NULL, col, cell);
+  gtk_tooltip_set_text (tooltip, _("You need to complete this location for it to appear in the menu."));
+  return TRUE;
+}
+
+static void
+handle_edit_started (GtkCellRendererText * renderer G_GNUC_UNUSED,
+                     GtkCellEditable * editable,
+                     gchar * path,
+                     CcTimezoneCompletion * completion)
+{
+  if (GTK_IS_ENTRY (editable)) {
+    GtkEntry *entry = GTK_ENTRY (editable);
+    cc_timezone_completion_watch_entry (completion, entry);
+
+    GtkListStore * store = GTK_LIST_STORE (g_object_get_data (G_OBJECT (completion), "store"));
+    GtkTreeIter * store_iter = g_new(GtkTreeIter, 1);
+    if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store), store_iter, path)) {
+      g_object_set_data_full (G_OBJECT (completion), "store_iter", store_iter, g_free);
+    }
+  }
+}
+
+static gboolean
+update_times (GtkWidget * dlg)
+{
+  /* For each entry, check zone in column 2 and set column 1 to it's time */
+  CcTimezoneCompletion * completion = CC_TIMEZONE_COMPLETION (g_object_get_data (G_OBJECT (dlg), "completion"));
+  GtkListStore * store = GTK_LIST_STORE (g_object_get_data (G_OBJECT (completion), "store"));
+  GObject * cell = G_OBJECT (g_object_get_data (G_OBJECT (completion), "name-cell"));
+
+  gboolean editing;
+  g_object_get (cell, "editing", &editing, NULL);
+  if (editing) { /* No updates while editing, it cancels the edit */
+    return TRUE;
+  }
+
+  g_signal_handlers_block_by_func (store, save_when_idle, dlg);
+
+  GSettings * settings = g_settings_new (SETTINGS_INTERFACE);
+  GtkTreeIter iter;
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
+    GDateTime * now = g_date_time_new_now_local ();
+    do {
+      gchar * strzone;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_ZONE, &strzone, -1);
+
+      if (strzone && *strzone) {
+        GTimeZone * tz = g_time_zone_new (strzone);
+        GDateTime * now_tz = g_date_time_to_timezone (now, tz);
+        gchar * format = generate_full_format_string_at_time (now, now_tz, settings);
+        gchar * time_str = g_date_time_format (now_tz, format);
+        gchar * old_time_str;
+
+        gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_TIME, &old_time_str, -1);
+        if (g_strcmp0 (old_time_str, time_str))
+          gtk_list_store_set (store, &iter, COL_TIME, time_str, -1);
+
+        g_free (old_time_str);
+        g_free (time_str);
+        g_free (format);
+        g_date_time_unref (now_tz);
+        g_time_zone_unref (tz);
+      }
+      g_free (strzone);
+    } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
+    g_date_time_unref (now);
+  }
+
+  g_object_unref (settings);
+
+  g_signal_handlers_unblock_by_func (store, save_when_idle, dlg);
+
+  return TRUE;
+}
+
+static void
+fill_from_settings (GObject * store, GSettings * conf)
+{
+  gchar ** locations = g_settings_get_strv (conf, SETTINGS_LOCATIONS_S);
+
+  gtk_list_store_clear (GTK_LIST_STORE (store));
+
+  gchar ** striter;
+  GtkTreeIter iter;
+  for (striter = locations; *striter; ++striter) {
+    gchar * zone, * name;
+    split_settings_location (*striter, &zone, &name);
+
+    gtk_list_store_append (GTK_LIST_STORE (store), &iter);
+    gtk_list_store_set (GTK_LIST_STORE (store), &iter,
+                        COL_VISIBLE_NAME, name,
+                        COL_ICON, NULL,
+                        COL_NAME, name,
+                        COL_ZONE, zone, -1);
+
+    g_free (zone);
+    g_free (name);
+  }
+
+  g_strfreev (locations);
+}
+
+static void
+save_to_settings (GObject * store, GSettings * conf)
+{
+  gboolean empty = TRUE;
+  GVariantBuilder builder;
+  g_variant_builder_init (&builder, G_VARIANT_TYPE_STRING_ARRAY);
+
+  GtkTreeIter iter;
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
+    GString * gstr = g_string_new (NULL);
+    do {
+      gchar * strname;
+      gchar * strzone;
+      gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+                          COL_NAME, &strname,
+                          COL_ZONE, &strzone,
+                          -1);
+      if (strzone && *strzone && strname && *strname) {
+        g_string_printf (gstr, "%s %s", strzone, strname);
+        g_variant_builder_add (&builder, "s", gstr->str);
+        empty = FALSE;
+      }
+      g_free (strname);
+      g_free (strzone);
+    } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
+    g_string_free (gstr, TRUE);
+  }
+
+  if (empty) {
+    /* Empty list */
+    g_variant_builder_clear (&builder);
+    g_settings_set_strv (conf, SETTINGS_LOCATIONS_S, NULL);
+  }
+  else {
+    g_settings_set_value (conf, SETTINGS_LOCATIONS_S, g_variant_builder_end (&builder));
+  }
+}
+
+static gboolean
+save_now (GtkWidget *dlg)
+{
+  GSettings * conf = G_SETTINGS (g_object_get_data (G_OBJECT (dlg), "conf"));
+  GObject * completion = G_OBJECT (g_object_get_data (G_OBJECT (dlg), "completion"));
+  GObject * store = G_OBJECT (g_object_get_data (completion, "store"));
+
+  save_to_settings (store, conf);
+
+  g_object_set_data (G_OBJECT (dlg), "save-id", GINT_TO_POINTER(0));
+
+  return FALSE;
+}
+
+static void
+save_when_idle (GtkWidget *dlg)
+{
+  guint save_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dlg), "save-id"));
+
+  if (save_id == 0) {
+    save_id = g_idle_add ((GSourceFunc)save_now, dlg);
+    g_object_set_data (G_OBJECT (dlg), "save-id", GINT_TO_POINTER(save_id));
+  }
+}
+
+static void
+dialog_closed (GtkWidget * dlg, GObject * store G_GNUC_UNUSED)
+{
+  /* Cleanup a tad */
+  guint time_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dlg), "time-id"));
+  g_source_remove (time_id);
+
+  guint save_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dlg), "save-id"));
+  if (save_id > 0)
+    g_source_remove (save_id);
+}
+
+static void
+selection_changed (GtkTreeSelection * selection, GtkWidget * remove_button)
+{
+  gint count = gtk_tree_selection_count_selected_rows (selection);
+  gtk_widget_set_sensitive (remove_button, count > 0);
+}
+
+static void
+update_button_sensitivity (GtkWidget * dlg)
+{
+  GObject * odlg = G_OBJECT(dlg);
+  GObject * completion = g_object_get_data(odlg, "completion");
+  GtkTreeModel * model = GTK_TREE_MODEL (g_object_get_data (completion, "store")); 
+  gboolean is_sorted_by_name;
+  gboolean is_sorted_by_time;
+  location_model_test_sorted (model, &is_sorted_by_name, &is_sorted_by_time);
+  gtk_widget_set_sensitive (GTK_WIDGET(g_object_get_data(odlg, "sortByNameButton")), !is_sorted_by_name);
+  gtk_widget_set_sensitive (GTK_WIDGET(g_object_get_data(odlg, "sortByTimeButton")), !is_sorted_by_time);
+}
+
+static void
+model_changed (GtkWidget * dlg)
+{
+  update_button_sensitivity (dlg);
+  save_when_idle (dlg);
+}
+
+GtkWidget *
+datetime_setup_locations_dialog (CcTimezoneMap * map)
+{
+  GError * error = NULL;
+  GtkBuilder * builder = gtk_builder_new ();
+  gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
+  gtk_builder_add_from_file (builder, DATETIME_DIALOG_UI_FILE, &error);
+  if (error != NULL) {
+    /* We have to abort, we can't continue without the ui file */
+    g_error ("Could not load ui file %s: %s", DATETIME_DIALOG_UI_FILE, error->message);
+    g_error_free (error);
+    return NULL;
+  }
+
+  GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
+
+#define WIG(name) GTK_WIDGET (gtk_builder_get_object (builder, name))
+
+  GtkWidget * dlg = WIG ("locationsDialog");
+  GtkWidget * tree = WIG ("locationsView");
+  GObject * store = gtk_builder_get_object (builder, "locationsStore");
+
+  /* Configure tree */
+  CcTimezoneCompletion * completion = cc_timezone_completion_new ();
+  g_object_set_data (G_OBJECT (completion), "tzmap", map);
+  g_object_set_data (G_OBJECT (completion), "store", store);
+  g_signal_connect (completion, "match-selected", G_CALLBACK (timezone_selected), dlg);
+
+  GtkCellRenderer * cell = gtk_cell_renderer_text_new ();
+  g_object_set (cell, "editable", TRUE, NULL);
+  g_signal_connect (cell, "editing-started", G_CALLBACK (handle_edit_started), completion);
+  g_signal_connect (cell, "edited", G_CALLBACK (handle_edit), store);
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree), -1,
+                                               _("Location"), cell,
+                                               "text", COL_VISIBLE_NAME, NULL);
+  GtkTreeViewColumn * loc_col = gtk_tree_view_get_column (GTK_TREE_VIEW (tree), 0);
+  gtk_tree_view_column_set_expand (loc_col, TRUE);
+  g_object_set_data (G_OBJECT (completion), "name-cell", cell);
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (loc_col, cell, FALSE);
+  gtk_tree_view_column_add_attribute (loc_col, cell, "icon-name", COL_ICON);
+
+  gtk_widget_set_has_tooltip (tree, TRUE);
+  g_signal_connect (tree, "query-tooltip", G_CALLBACK (query_tooltip), cell);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_cell_renderer_set_alignment (cell, 1.0f, 0.5f);
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree), -1,
+                                               _("Time"), cell,
+                                               "text", COL_TIME, NULL);
+
+  GtkTreeSelection * selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
+  gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+  g_signal_connect (selection, "changed", G_CALLBACK (selection_changed), WIG ("removeButton"));
+  selection_changed (selection, WIG ("removeButton"));
+
+  g_signal_connect (WIG ("addButton"), "clicked", G_CALLBACK (handle_add), tree);
+  g_signal_connect (WIG ("removeButton"), "clicked", G_CALLBACK (handle_remove), tree);
+
+  GtkWidget * w = WIG ("sortByNameButton");
+  g_signal_connect (w, "clicked", G_CALLBACK (handle_sort_by_name), tree);
+  g_object_set_data (G_OBJECT(dlg), "sortByNameButton", w);
+
+  w = WIG ("sortByTimeButton");
+  g_signal_connect (w, "clicked", G_CALLBACK (handle_sort_by_time), tree);
+  g_object_set_data (G_OBJECT(dlg), "sortByTimeButton", w);
+
+  fill_from_settings (store, conf);
+  g_signal_connect_swapped (store, "row-deleted", G_CALLBACK (model_changed), dlg);
+  g_signal_connect_swapped (store, "row-inserted", G_CALLBACK (model_changed), dlg);
+  g_signal_connect_swapped (store, "row-changed", G_CALLBACK (model_changed), dlg);
+  g_signal_connect_swapped (store, "rows-reordered", G_CALLBACK (model_changed), dlg);
+  g_object_set_data_full (G_OBJECT (dlg), "conf", g_object_ref (conf), g_object_unref);
+  g_object_set_data_full (G_OBJECT (dlg), "completion", completion, g_object_unref);
+  g_signal_connect (dlg, "destroy", G_CALLBACK (dialog_closed), store);
+
+  guint time_id = g_timeout_add_seconds (2, (GSourceFunc)update_times, dlg);
+  g_object_set_data (G_OBJECT (dlg), "time-id", GINT_TO_POINTER(time_id));
+  update_times (dlg);
+
+#undef WIG
+
+  g_object_unref (conf);
+  g_object_unref (builder);
+
+  return dlg;
+}
+

=== added file 'panels/datetime/datetime-prefs-locations.h'
--- panels/datetime/datetime-prefs-locations.h	1970-01-01 00:00:00 +0000
+++ panels/datetime/datetime-prefs-locations.h	2014-03-03 10:09:16 +0000
@@ -0,0 +1,35 @@
+/* -*- Mode: C; coding: utf-8; indent-tabs-mode: nil; tab-width: 2 -*-
+
+A dialog for setting time and date preferences.
+
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Michael Terry <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __DATETIME_PREFS_LOCATIONS_H__
+#define __DATETIME_PREFS_LOCATIONS_H__
+
+#include <gtk/gtk.h>
+#include <timezonemap/cc-timezone-map.h>
+
+G_BEGIN_DECLS
+
+GtkWidget * datetime_setup_locations_dialog (CcTimezoneMap * map);
+
+G_END_DECLS
+
+#endif

=== added file 'panels/datetime/datetime-prefs.c'
--- panels/datetime/datetime-prefs.c	1970-01-01 00:00:00 +0000
+++ panels/datetime/datetime-prefs.c	2014-03-03 10:09:16 +0000
@@ -0,0 +1,860 @@
+/* -*- Mode: C; coding: utf-8; indent-tabs-mode: nil; tab-width: 2 -*-
+
+A dialog for setting time and date preferences.
+
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Ted Gould <[e-mail]>
+    Michael Terry <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <libintl.h>
+#include <locale.h>
+#include <langinfo.h>
+#include <glib/gi18n-lib.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <polkit/polkit.h>
+#include <shell/cc-panel.h>
+#include <timezonemap/cc-timezone-map.h>
+#include <timezonemap/timezone-completion.h>
+
+#include "settings-shared.h"
+#include "utils.h"
+#include "datetime-prefs-locations.h"
+
+#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/ui/datetime/datetime-dialog.ui"
+
+#define INDICATOR_DATETIME_TYPE_PANEL indicator_datetime_panel_get_type()
+
+typedef struct _IndicatorDatetimePanel IndicatorDatetimePanel;
+typedef struct _IndicatorDatetimePanelPrivate IndicatorDatetimePanelPrivate;
+typedef struct _IndicatorDatetimePanelClass IndicatorDatetimePanelClass;
+
+struct _IndicatorDatetimePanel
+{
+  CcPanel parent;
+  IndicatorDatetimePanelPrivate * priv;
+};
+
+struct _IndicatorDatetimePanelPrivate
+{
+  guint                name_watch_id;
+  GtkBuilder *         builder;
+  GDBusProxy *         proxy;
+  GtkWidget *          auto_radio;
+  GtkWidget *          tz_entry;
+  CcTimezoneMap *      tzmap;
+  GtkWidget *          time_spin;
+  GtkWidget *          date_spin;
+  guint                save_time_id;
+  gboolean             user_edited_time;
+  gboolean             changing_time;
+  GtkWidget *          loc_dlg;
+  GSettings *          settings;
+  CcTimezoneCompletion * completion;
+};
+
+struct _IndicatorDatetimePanelClass
+{
+  CcPanelClass parent_class;
+};
+
+G_DEFINE_DYNAMIC_TYPE (IndicatorDatetimePanel, indicator_datetime_panel, CC_TYPE_PANEL)
+
+/* Turns the boolean property into a string gsettings */
+static GVariant *
+bind_hours_set (const GValue       * value,
+                const GVariantType * type G_GNUC_UNUSED,
+                gpointer             user_data)
+{
+  const gchar * output = NULL;
+  gboolean is_12hour_button = (gboolean)GPOINTER_TO_INT(user_data);
+
+  if (g_value_get_boolean(value)) {
+    /* Only do anything if we're setting active = true */
+    output = is_12hour_button ? "12-hour" : "24-hour";
+  } else {
+    return NULL;
+  }
+
+  return g_variant_new_string (output);
+}
+
+/* Turns a string gsettings into a boolean property */
+static gboolean
+bind_hours_get (GValue * value, GVariant * variant, gpointer user_data)
+{
+  const gchar * str = g_variant_get_string(variant, NULL);
+  gboolean output = FALSE;
+  gboolean is_12hour_button = (gboolean)GPOINTER_TO_INT(user_data);
+
+  if (g_strcmp0(str, "locale-default") == 0) {
+    output = (is_12hour_button == is_locale_12h ());
+  } else if (g_strcmp0(str, "12-hour") == 0) {
+    output = is_12hour_button;
+  } else if (g_strcmp0(str, "24-hour") == 0) {
+    output = !is_12hour_button;
+  } else {
+    return FALSE;
+  }
+
+  g_value_set_boolean (value, output);
+  return TRUE;
+}
+
+static void
+widget_dependency_cb (GtkWidget * parent, GParamSpec *pspec G_GNUC_UNUSED, GtkWidget * dependent)
+{
+  gboolean active, sensitive;
+  g_object_get (G_OBJECT (parent),
+                "active", &active,
+                "sensitive", &sensitive, NULL);
+  gtk_widget_set_sensitive (dependent, active && sensitive);
+}
+
+static void
+add_widget_dependency (GtkWidget * parent, GtkWidget * dependent)
+{
+  g_signal_connect (parent, "notify::active", G_CALLBACK(widget_dependency_cb),
+                    dependent);
+  g_signal_connect (parent, "notify::sensitive", G_CALLBACK(widget_dependency_cb),
+                    dependent);
+  widget_dependency_cb (parent, NULL, dependent);
+}
+
+static void
+polkit_dependency_cb (GPermission * permission, GParamSpec *pspec G_GNUC_UNUSED, GtkWidget * dependent)
+{
+  gboolean allowed = FALSE;
+
+  g_object_get (G_OBJECT (permission),
+                "allowed", &allowed, NULL);
+
+  gtk_widget_set_sensitive (dependent, allowed);
+}
+
+static void
+add_polkit_dependency_helper (GtkWidget * parent, GParamSpec *pspec G_GNUC_UNUSED, GtkWidget * dependent)
+{
+  GtkLockButton * button = GTK_LOCK_BUTTON (parent);
+  GPermission * permission = gtk_lock_button_get_permission (button);
+  g_signal_connect (permission, "notify::allowed",
+                    G_CALLBACK(polkit_dependency_cb), dependent);
+  polkit_dependency_cb (permission, NULL, dependent);
+}
+
+static void
+add_polkit_dependency (GtkWidget * parent, GtkWidget * dependent)
+{
+  /* polkit async hasn't finished at this point, so wait for permission to come in */
+  g_signal_connect (parent, "notify::permission", G_CALLBACK(add_polkit_dependency_helper),
+                    dependent);
+  gtk_widget_set_sensitive (dependent, FALSE);
+}
+
+static void
+polkit_perm_ready (GObject *source_object G_GNUC_UNUSED, GAsyncResult *res, gpointer user_data)
+{
+  GError * error = NULL;
+  GPermission * permission = polkit_permission_new_finish (res, &error);
+
+  if (error != NULL) {
+    if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+      g_warning ("Could not get permission object: %s", error->message);
+    g_error_free (error);
+    return;
+  }
+
+  GtkLockButton * button = GTK_LOCK_BUTTON (user_data);
+  gtk_lock_button_set_permission (button, permission);
+}
+
+static void
+dbus_set_answered (GObject *object, GAsyncResult *res, gpointer command)
+{
+  GError * error = NULL;
+  GVariant * answers = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), res, &error);
+
+  if (error != NULL) {
+    if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+      g_warning("Could not set '%s' using timedated: %s", (gchar *)command, error->message);
+    g_error_free(error);
+    return;
+  }
+
+  g_variant_unref (answers);
+}
+
+static void
+toggle_ntp (GtkWidget * radio, GParamSpec * pspec G_GNUC_UNUSED, IndicatorDatetimePanel * self)
+{
+  gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio));
+
+  g_dbus_proxy_call (self->priv->proxy, "SetNTP", g_variant_new ("(bb)", active, TRUE),
+                     G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "NTP");
+}
+
+static void
+sync_entry (IndicatorDatetimePanel * self, const gchar * location)
+{
+  gchar * name = get_current_zone_name (location, self->priv->settings);
+  gtk_entry_set_text (GTK_ENTRY (self->priv->tz_entry), name);
+  g_free (name);
+
+  gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->tz_entry),
+                                     GTK_ENTRY_ICON_SECONDARY, NULL);
+}
+
+static void
+tz_changed (CcTimezoneMap * map G_GNUC_UNUSED,
+            CcTimezoneLocation * location,
+            IndicatorDatetimePanel * self)
+{
+  if (location == NULL)
+    return;
+
+  gchar * zone;
+  g_object_get (location, "zone", &zone, NULL);
+
+  g_dbus_proxy_call (self->priv->proxy, "SetTimezone", g_variant_new ("(sb)", zone, TRUE),
+                     G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "timezone");
+
+  sync_entry (self, zone);
+
+  g_free (zone);
+}
+
+static void
+proxy_ready (GObject *object G_GNUC_UNUSED,
+             GAsyncResult *res,
+             IndicatorDatetimePanel * self)
+{
+  GError * error = NULL;
+  IndicatorDatetimePanelPrivate * priv = self->priv;
+  GVariant *value;
+
+  self->priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+
+  if (error != NULL) {
+    if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+      g_critical("Could not grab DBus proxy for timedated: %s", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  /* And now, do initial proxy configuration */
+  value = g_dbus_proxy_get_cached_property (priv->proxy, "CanNTP");
+  if (value != NULL)
+    {
+      if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
+        gtk_widget_set_sensitive (priv->auto_radio, g_variant_get_boolean (value));
+      g_variant_unref (value);
+    }
+
+  value = g_dbus_proxy_get_cached_property (priv->proxy, "NTP");
+  if (value != NULL)
+    {
+      if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
+        {
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->auto_radio), g_variant_get_boolean (value));
+          g_signal_connect (priv->auto_radio, "notify::active", G_CALLBACK (toggle_ntp), self);
+        }
+      g_variant_unref (value);
+    }
+
+  value = g_dbus_proxy_get_cached_property (priv->proxy, "Timezone");
+  if (value != NULL)
+    {
+      if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
+        {
+          const gchar *timezone = g_variant_get_string (value, NULL);
+
+          cc_timezone_map_set_timezone (priv->tzmap, timezone);
+          sync_entry (self, timezone);
+          g_signal_connect (priv->tzmap, "location-changed", G_CALLBACK (tz_changed), self);
+        }
+      g_variant_unref (value);
+    }
+}
+
+#define WIG(name) GTK_WIDGET (gtk_builder_get_object(self->priv->builder, name))
+
+static void
+set_show_clock_check_sensitive (IndicatorDatetimePanel  * self,
+                                gboolean                  sensitive)
+{
+  gtk_widget_set_sensitive (WIG("showClockCheck"), sensitive);
+}
+
+static void
+on_bus_name_appeared (GDBusConnection * connection   G_GNUC_UNUSED,
+                      const char      * name         G_GNUC_UNUSED,
+                      const char      * name_owner,
+                      gpointer          self)
+{
+  set_show_clock_check_sensitive (self, name_owner && *name_owner);
+}
+
+static void
+on_bus_name_vanished (GDBusConnection * connection   G_GNUC_UNUSED,
+                      const char      * name         G_GNUC_UNUSED,
+                      gpointer          self)
+{
+  set_show_clock_check_sensitive (self, FALSE);
+}
+
+static gboolean
+are_spinners_focused (IndicatorDatetimePanel * self)
+{
+  // save_time_id means that we were in focus and haven't finished our save
+  // yet, so act like we are still focused.
+  return self->priv->save_time_id ||
+         gtk_widget_has_focus (self->priv->time_spin) ||
+         gtk_widget_has_focus (self->priv->date_spin);
+}
+
+static gboolean
+save_time (IndicatorDatetimePanel * self)
+{
+  if (self->priv->user_edited_time) {
+    gdouble current_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (self->priv->date_spin));
+    g_dbus_proxy_call (self->priv->proxy, "SetTime",
+                       g_variant_new ("(xbb)", (gint64) (current_value * G_TIME_SPAN_SECOND), FALSE, TRUE),
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "time");
+  }
+  self->priv->user_edited_time = FALSE;
+  self->priv->save_time_id = 0;
+  return FALSE;
+}
+
+static gboolean
+spin_focus_in (IndicatorDatetimePanel * self)
+{
+  if (self->priv->save_time_id > 0) {
+    g_source_remove (self->priv->save_time_id);
+    self->priv->save_time_id = 0;
+  }
+  return FALSE;
+}
+
+static gboolean
+spin_focus_out (IndicatorDatetimePanel * self)
+{
+  /* We want to only save when both spinners are unfocused.  But it's difficult
+     to tell who is about to get focus during a focus-out.  So we set an idle
+     callback to save the time if we don't focus in to another spinner by that
+     time. */
+  if (self->priv->save_time_id == 0) {
+    self->priv->save_time_id = g_idle_add ((GSourceFunc)save_time, self);
+  }
+  return FALSE;
+}
+
+static int
+input_time_text (GtkWidget * spinner, gdouble * value, IndicatorDatetimePanel * self)
+{
+  gboolean is_time = (gboolean)GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinner), "is-time"));
+  const gchar * text = gtk_entry_get_text (GTK_ENTRY (spinner));
+
+  gdouble current_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinner));
+  *value = current_value;
+
+  GDateTime * now = g_date_time_new_from_unix_local (current_value);
+  gint year, month, day, hour, minute, second;
+  year = g_date_time_get_year (now);
+  month = g_date_time_get_month (now);
+  day = g_date_time_get_day_of_month (now);
+  hour = g_date_time_get_hour (now);
+  minute = g_date_time_get_minute (now);
+  second = g_date_time_get_second (now);
+  g_date_time_unref (now);
+
+  /* Parse this string as if it were in the output format */
+  gint scanned = 0;
+  gboolean passed = TRUE, skip = FALSE;
+  if (is_time) {
+    gint hour_in, minute_in, second_in;
+
+    if (is_locale_12h ()) { // TODO: make this look-at/watch gsettings?
+      char ampm[51];
+
+      /* coverity[secure_coding] */
+      scanned = sscanf (text, "%u:%u:%u %50s", &hour_in, &minute_in, &second_in, ampm);
+      passed = (scanned == 4);
+
+      if (passed) {
+        const char *pm_str = nl_langinfo (PM_STR);
+        if (g_ascii_strcasecmp (pm_str, ampm) == 0) {
+          hour_in += 12;
+        }
+      }
+    } else {
+      /* coverity[secure_coding] */
+      scanned = sscanf (text, "%u:%u:%u", &hour_in, &minute_in, &second_in);
+      passed = (scanned == 3);
+    }
+
+    if (passed && (hour_in > 23 || minute_in > 59 || second_in > 59)) {
+      passed = FALSE;
+    }
+    if (passed && hour == hour_in && minute == minute_in && second == second_in) {
+      skip = TRUE; // no change
+    } else {
+      hour = hour_in;
+      minute = minute_in;
+      second = second_in;
+    }
+  }
+  else {
+    gint year_in, month_in, day_in;
+
+    /* coverity[secure_coding] */
+    scanned = sscanf (text, "%u-%u-%u", &year_in, &month_in, &day_in);
+
+    if (scanned != 3 || year_in < 1 || year_in > 9999 ||
+        month_in < 1 || month_in > 12 || day_in < 1 || day_in > 31) {
+      passed = FALSE;
+    }
+    if (passed && year == year_in && month == month_in && day == day_in) {
+      skip = TRUE; // no change
+    } else {
+      year = year_in;
+      month = month_in;
+      day = day_in;
+    }
+  }
+
+  if (!passed) {
+    g_warning ("Could not understand %s", text);
+    return TRUE;
+  }
+
+  if (skip) {
+    return TRUE;
+  }
+
+  gboolean prev_changing = self->priv->changing_time;
+  self->priv->changing_time = TRUE;
+  GDateTime * new_time = g_date_time_new_local (year, month, day, hour, minute, second);
+  *value = g_date_time_to_unix (new_time);
+  self->priv->user_edited_time = TRUE;
+  g_date_time_unref (new_time);
+  self->priv->changing_time = prev_changing;
+
+  return TRUE;
+}
+
+static gboolean
+format_time_text (GtkWidget * spinner, gpointer user_data G_GNUC_UNUSED)
+{
+  gboolean is_time = (gboolean)GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinner), "is-time"));
+
+  const gchar * format;
+  if (is_time) {
+    if (is_locale_12h ()) { // TODO: make this look-at/watch gsettings?
+      format = "%I:%M:%S %p";
+    } else {
+      format = "%H:%M:%S";
+    }
+  }
+  else {
+    // This is intentionally not "%x".  See https://launchpad.net/bugs/1149696
+    // If you are willing to do the hard work of writing a locale-sensitive
+    // date parser, there is an open bug: https://launchpad.net/bugs/729056
+    format = "%Y-%m-%d";
+  }
+
+  GDateTime * datetime = g_date_time_new_from_unix_local (gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinner)));
+  gchar * formatted = g_date_time_format (datetime, format);
+  gtk_entry_set_text (GTK_ENTRY (spinner), formatted);
+  g_date_time_unref (datetime);
+
+  return TRUE;
+}
+
+static void
+spin_copy_value (GtkSpinButton * spinner, IndicatorDatetimePanel * self)
+{
+  GtkSpinButton * other = NULL;
+  if (GTK_WIDGET (spinner) == self->priv->date_spin)
+    other = GTK_SPIN_BUTTON (self->priv->time_spin);
+  else
+    other = GTK_SPIN_BUTTON (self->priv->date_spin);
+
+  if (gtk_spin_button_get_value (spinner) != gtk_spin_button_get_value (other)) {
+    gtk_spin_button_set_value (other, gtk_spin_button_get_value (spinner));
+  }
+  if (!self->priv->changing_time) { /* Means user pressed spin buttons */
+    self->priv->user_edited_time = TRUE;
+  }
+}
+
+static gboolean
+update_spinners (IndicatorDatetimePanel * self)
+{
+  /* Add datetime object to spinner, which will hold the real time value, rather
+     then using the value of the spinner itself.  And don't update while user is
+     editing. */
+  if (!are_spinners_focused (self)) {
+    gboolean prev_changing = self->priv->changing_time;
+    self->priv->changing_time = TRUE;
+    GDateTime * now = g_date_time_new_now_local ();
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (self->priv->time_spin),
+                               (gdouble)g_date_time_to_unix (now));
+    /* will be copied to other spin button */
+    g_date_time_unref (now);
+    self->priv->changing_time = prev_changing;
+  }
+  return TRUE;
+}
+
+static void
+setup_time_spinners (IndicatorDatetimePanel * self, GtkWidget * time, GtkWidget * date)
+{
+  g_signal_connect (time, "input", G_CALLBACK (input_time_text), self);
+  g_signal_connect (date, "input", G_CALLBACK (input_time_text), self);
+
+  g_signal_connect (time, "output", G_CALLBACK (format_time_text), date);
+  g_signal_connect (date, "output", G_CALLBACK (format_time_text), time);
+
+  g_signal_connect_swapped (time, "focus-in-event", G_CALLBACK (spin_focus_in), self);
+  g_signal_connect_swapped (date, "focus-in-event", G_CALLBACK (spin_focus_in), self);
+
+  g_signal_connect_swapped (time, "focus-out-event", G_CALLBACK (spin_focus_out), self);
+  g_signal_connect_swapped (date, "focus-out-event", G_CALLBACK (spin_focus_out), self);
+
+  g_signal_connect (time, "value-changed", G_CALLBACK (spin_copy_value), self);
+  g_signal_connect (date, "value-changed", G_CALLBACK (spin_copy_value), self);
+
+  g_object_set_data (G_OBJECT (time), "is-time", GINT_TO_POINTER (TRUE));
+  g_object_set_data (G_OBJECT (date), "is-time", GINT_TO_POINTER (FALSE));
+
+  self->priv->time_spin = time;
+  self->priv->date_spin = date;
+
+  /* 2 seconds is what the indicator itself uses */
+  guint time_id = g_timeout_add_seconds (2, (GSourceFunc)update_spinners, self);
+  g_signal_connect_swapped (self->priv->time_spin, "destroy",
+                            G_CALLBACK (g_source_remove), GINT_TO_POINTER (time_id));
+  update_spinners (self);
+}
+
+static void
+show_locations (IndicatorDatetimePanel * self)
+{
+  if (self->priv->loc_dlg == NULL) {
+    self->priv->loc_dlg = datetime_setup_locations_dialog (self->priv->tzmap);
+    GtkWidget * dlg = gtk_widget_get_toplevel (GTK_WIDGET (self));
+    gtk_window_set_type_hint (GTK_WINDOW(self->priv->loc_dlg), GDK_WINDOW_TYPE_HINT_DIALOG);
+    gtk_window_set_transient_for (GTK_WINDOW (self->priv->loc_dlg), GTK_WINDOW (dlg));
+    g_signal_connect (self->priv->loc_dlg, "destroy", G_CALLBACK (gtk_widget_destroyed), &self->priv->loc_dlg);
+    gtk_widget_show_all (self->priv->loc_dlg);
+  }
+  else {
+    gtk_window_present_with_time (GTK_WINDOW (self->priv->loc_dlg), gtk_get_current_event_time ());
+  }
+}
+
+static gboolean
+timezone_selected (GtkEntryCompletion * widget G_GNUC_UNUSED,
+                   GtkTreeModel * model,
+                   GtkTreeIter * iter,
+                   IndicatorDatetimePanel * self)
+{
+  const gchar * name, * zone;
+
+  gtk_tree_model_get (model, iter,
+                      CC_TIMEZONE_COMPLETION_NAME, &name,
+                      CC_TIMEZONE_COMPLETION_ZONE, &zone,
+                      -1);
+
+  if (zone == NULL || zone[0] == 0) {
+    const gchar * strlon, * strlat;
+    gdouble lon = 0.0, lat = 0.0;
+
+    gtk_tree_model_get (model, iter,
+                        CC_TIMEZONE_COMPLETION_LONGITUDE, &strlon,
+                        CC_TIMEZONE_COMPLETION_LATITUDE, &strlat,
+                        -1);
+
+    if (strlon != NULL && strlon[0] != 0) {
+      lon = g_ascii_strtod(strlon, NULL);
+    }
+
+    if (strlat != NULL && strlat[0] != 0) {
+      lat = g_ascii_strtod(strlat, NULL);
+    }
+
+    zone = cc_timezone_map_get_timezone_at_coords (self->priv->tzmap, lon, lat);
+  }
+
+  gchar * tz_name = g_strdup_printf ("%s %s", zone, name);
+  g_settings_set_string (self->priv->settings, SETTINGS_TIMEZONE_NAME_S, tz_name);
+  g_free (tz_name);
+
+  cc_timezone_map_set_timezone (self->priv->tzmap, zone);
+
+  return FALSE; // Do normal action too
+}
+
+static gboolean
+entry_focus_out (GtkEntry * entry,
+                 GdkEventFocus * event G_GNUC_UNUSED,
+                 IndicatorDatetimePanel * self)
+{
+  // If the name left in the entry doesn't match the current timezone name,
+  // show an error icon.  It's always an error for the user to manually type in
+  // a timezone.
+  CcTimezoneLocation * location = cc_timezone_map_get_location (self->priv->tzmap);
+  if (location == NULL)
+    return FALSE;
+
+  gchar * zone;
+  g_object_get (location, "zone", &zone, NULL);
+
+  gchar * name = get_current_zone_name (zone, self->priv->settings);
+  gboolean correct = (g_strcmp0 (gtk_entry_get_text (entry), name) == 0);
+  g_free (name);
+  g_free (zone);
+
+  gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY,
+                                     correct ? NULL : "dialog-error");
+  gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY,
+                                   _("You need to choose a location to change the time zone."));
+  gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE);
+  return FALSE;
+}
+
+static void
+indicator_datetime_panel_init (IndicatorDatetimePanel * self)
+{
+  GError * error;
+  GSettings * conf;
+
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+                                            INDICATOR_DATETIME_TYPE_PANEL,
+                                            IndicatorDatetimePanelPrivate);
+
+  self->priv->settings = conf = g_settings_new (SETTINGS_INTERFACE);
+
+  self->priv->builder = gtk_builder_new ();
+  gtk_builder_set_translation_domain (self->priv->builder, GETTEXT_PACKAGE);
+  error = NULL;
+  gtk_builder_add_from_file (self->priv->builder, DATETIME_DIALOG_UI_FILE, &error);
+  if (error != NULL) {
+    /* We have to abort, we can't continue without the ui file */
+    g_error ("Could not load ui file %s: %s", DATETIME_DIALOG_UI_FILE, error->message);
+    g_error_free (error);
+    return;
+  }
+
+
+  /* Add policykit button */
+  GtkWidget * polkit_button = gtk_lock_button_new (NULL);
+  g_object_set (G_OBJECT (polkit_button),
+                "text-unlock", _("Unlock to change these settings"),
+                "text-lock", _("Lock to prevent further changes"),
+                NULL);
+  GtkWidget * alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (alignment), polkit_button);
+  gtk_box_pack_start (GTK_BOX (WIG ("timeDateBox")), alignment, FALSE, TRUE, 0);
+
+  const gchar * polkit_name = "com.canonical.controlcenter.datetime.configure";
+  polkit_permission_new (polkit_name, NULL, NULL, polkit_perm_ready, polkit_button);
+
+  /* Add map */
+  self->priv->tzmap = cc_timezone_map_new ();
+  gtk_container_add (GTK_CONTAINER (WIG ("mapBox")), GTK_WIDGET (self->priv->tzmap));
+  /* Fufill the CC by Attribution license requirements for the Geonames lookup */
+  cc_timezone_map_set_watermark (self->priv->tzmap, "Geonames.org");
+
+  /* And completion entry */
+  self->priv->completion = cc_timezone_completion_new ();
+  cc_timezone_completion_watch_entry (self->priv->completion, GTK_ENTRY (WIG ("timezoneEntry")));
+  g_signal_connect (self->priv->completion, "match-selected", G_CALLBACK (timezone_selected), self);
+  g_signal_connect (WIG ("timezoneEntry"), "focus-out-event", G_CALLBACK (entry_focus_out), self);
+
+  /* Set up settings bindings */
+  g_settings_bind (conf, SETTINGS_SHOW_CLOCK_S, WIG ("showClockCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_DAY_S, WIG ("showWeekdayCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_DATE_S, WIG ("showDateAndMonthCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_YEAR_S, WIG ("showYearCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_SECONDS_S, WIG ("showSecondsCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind_with_mapping (conf, SETTINGS_TIME_FORMAT_S,
+                                WIG ("show12HourRadio"), "active",
+                                G_SETTINGS_BIND_DEFAULT,
+                                bind_hours_get, bind_hours_set,
+                                GINT_TO_POINTER(TRUE), NULL);
+  g_settings_bind_with_mapping (conf, SETTINGS_TIME_FORMAT_S,
+                                WIG ("show24HourRadio"), "active",
+                                G_SETTINGS_BIND_DEFAULT,
+                                bind_hours_get, bind_hours_set,
+                                GINT_TO_POINTER(FALSE), NULL);
+  g_settings_bind (conf, SETTINGS_SHOW_CALENDAR_S, WIG ("showCalendarCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_WEEK_NUMBERS_S, WIG ("includeWeekNumbersCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_EVENTS_S, WIG ("showEventsCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_DETECTED_S, WIG ("showDetectedCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (conf, SETTINGS_SHOW_LOCATIONS_S, WIG ("showLocationsCheck"),
+                   "active", G_SETTINGS_BIND_DEFAULT);
+
+  /* Set up sensitivities */
+  add_widget_dependency (WIG ("showDateAndMonthCheck"), WIG ("showYearCheck"));
+  add_widget_dependency (WIG ("showCalendarCheck"), WIG ("calendarOptions"));
+  add_widget_dependency (WIG ("showClockCheck"), WIG ("clockOptions"));
+  add_widget_dependency (WIG ("showLocationsCheck"), WIG ("locationsButton"));
+  add_widget_dependency (WIG ("manualTimeRadio"), WIG ("manualOptions"));
+  add_polkit_dependency (polkit_button, WIG ("timeDateOptions"));
+
+  /* Hacky proxy test for whether evolution-data-server is installed */
+  gchar * evo_path = g_find_program_in_path ("evolution");
+  gtk_widget_set_sensitive (WIG ("showEventsCheck"), (evo_path != NULL));
+  g_free (evo_path);
+
+  setup_time_spinners (self, WIG ("timeSpinner"), WIG ("dateSpinner"));
+
+  GtkWidget * panel = WIG ("timeDatePanel");
+  self->priv->auto_radio = WIG ("automaticTimeRadio");
+  self->priv->tz_entry = WIG ("timezoneEntry");
+
+  g_signal_connect_swapped (WIG ("locationsButton"), "clicked", G_CALLBACK (show_locations), self);
+
+  /* Grab proxy for settings daemon */
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL,
+                            "org.freedesktop.timedate1",
+                            "/org/freedesktop/timedate1",
+                            "org.freedesktop.timedate1",
+                            NULL, (GAsyncReadyCallback)proxy_ready, self);
+
+  /* Grab proxy for datetime service, to see if it's running.  It would
+     actually be more ideal to see if the indicator module itself is running,
+     but that doesn't yet claim a name on the bus.  Presumably the service
+     would have been started by any such indicator, so this will at least tell
+     us if there *was* a datetime module run this session. */
+  self->priv->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                                "com.canonical.indicator.datetime",
+                                                G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                                on_bus_name_appeared,
+                                                on_bus_name_vanished,
+                                                self,
+                                                NULL);
+
+#undef WIG
+
+  gtk_widget_show_all (panel);
+  gtk_container_add (GTK_CONTAINER (self), panel);
+}
+
+static void
+indicator_datetime_panel_dispose (GObject * object)
+{
+  IndicatorDatetimePanel * self = (IndicatorDatetimePanel *) object;
+  IndicatorDatetimePanelPrivate * priv = self->priv;
+
+  g_clear_object (&priv->builder);
+  g_clear_object (&priv->proxy);
+  g_clear_object (&priv->settings);
+
+  if (priv->loc_dlg) {
+    gtk_widget_destroy (priv->loc_dlg);
+    priv->loc_dlg = NULL;
+  }
+
+  if (priv->name_watch_id != 0) {
+    g_bus_unwatch_name (priv->name_watch_id);
+    priv->name_watch_id = 0;
+  }
+
+  if (priv->save_time_id) {
+    g_source_remove (priv->save_time_id);
+    priv->save_time_id = 0;
+  }
+
+  if (priv->completion) {
+    cc_timezone_completion_watch_entry (priv->completion, NULL);
+    g_clear_object (&priv->completion);
+  }
+
+  if (priv->tz_entry) {
+    gtk_widget_destroy (priv->tz_entry);
+    priv->tz_entry = NULL;
+  }
+
+  if (priv->time_spin) {
+    gtk_widget_destroy (priv->time_spin);
+    priv->time_spin = NULL;
+  }
+
+  if (priv->date_spin) {
+    gtk_widget_destroy (priv->date_spin);
+    priv->date_spin = NULL;
+  }
+
+  G_OBJECT_CLASS (indicator_datetime_panel_parent_class)->dispose (object);
+}
+
+static void
+indicator_datetime_panel_class_finalize (IndicatorDatetimePanelClass *klass G_GNUC_UNUSED)
+{
+}
+
+static const char *
+indicator_datetime_panel_get_help_uri (CcPanel *panel G_GNUC_UNUSED)
+{
+  return "help:ubuntu-help/clock";
+}
+
+static void
+indicator_datetime_panel_class_init (IndicatorDatetimePanelClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
+
+  g_type_class_add_private (klass, sizeof (IndicatorDatetimePanelPrivate));
+
+  panel_class->get_help_uri = indicator_datetime_panel_get_help_uri;
+
+  gobject_class->dispose = indicator_datetime_panel_dispose;
+}
+
+void
+g_io_module_load (GIOModule *module)
+{
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+  indicator_datetime_panel_register_type (G_TYPE_MODULE (module));
+  g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+                                  INDICATOR_DATETIME_TYPE_PANEL,
+                                  "datetime", 0);
+}
+
+void
+g_io_module_unload (GIOModule *module G_GNUC_UNUSED)
+{
+}

=== added directory 'panels/datetime/icons'
=== added directory 'panels/datetime/icons/16x16'
=== added file 'panels/datetime/icons/16x16/unity-datetime-panel.png'
Binary files panels/datetime/icons/16x16/unity-datetime-panel.png	1970-01-01 00:00:00 +0000 and panels/datetime/icons/16x16/unity-datetime-panel.png	2014-03-03 10:09:16 +0000 differ
=== added directory 'panels/datetime/icons/22x22'
=== added file 'panels/datetime/icons/22x22/unity-datetime-panel.png'
Binary files panels/datetime/icons/22x22/unity-datetime-panel.png	1970-01-01 00:00:00 +0000 and panels/datetime/icons/22x22/unity-datetime-panel.png	2014-03-03 10:09:16 +0000 differ
=== added directory 'panels/datetime/icons/256x256'
=== added file 'panels/datetime/icons/256x256/unity-datetime-panel.png'
Binary files panels/datetime/icons/256x256/unity-datetime-panel.png	1970-01-01 00:00:00 +0000 and panels/datetime/icons/256x256/unity-datetime-panel.png	2014-03-03 10:09:16 +0000 differ
=== added directory 'panels/datetime/icons/32x32'
=== added file 'panels/datetime/icons/32x32/unity-datetime-panel.png'
Binary files panels/datetime/icons/32x32/unity-datetime-panel.png	1970-01-01 00:00:00 +0000 and panels/datetime/icons/32x32/unity-datetime-panel.png	2014-03-03 10:09:16 +0000 differ
=== added directory 'panels/datetime/icons/48x48'
=== added file 'panels/datetime/icons/48x48/unity-datetime-panel.png'
Binary files panels/datetime/icons/48x48/unity-datetime-panel.png	1970-01-01 00:00:00 +0000 and panels/datetime/icons/48x48/unity-datetime-panel.png	2014-03-03 10:09:16 +0000 differ
=== added directory 'panels/datetime/icons/scalable'
=== added file 'panels/datetime/icons/scalable/unity-datetime-panel.svg'
--- panels/datetime/icons/scalable/unity-datetime-panel.svg	1970-01-01 00:00:00 +0000
+++ panels/datetime/icons/scalable/unity-datetime-panel.svg	2014-03-03 10:09:16 +0000
@@ -0,0 +1,861 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg3639"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs3641">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3647" />
+    <inkscape:perspective
+       id="perspective3453"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13249-6-3"
+       id="radialGradient6295-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9936278,0,0,0.3495627,3.5429153,708.68473)"
+       cx="556"
+       cy="1115.3873"
+       fx="556"
+       fy="1115.3873"
+       r="44" />
+    <linearGradient
+       id="linearGradient13249-6-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop13251-6-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop13253-9-5" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4254-7"
+       id="radialGradient6297-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.5434298,0,0,1.553224,-832.13128,-571.17705)"
+       cx="539.14423"
+       cy="1032.4518"
+       fx="539.14423"
+       fy="1032.4518"
+       r="44" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4254-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4256-17" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4258-0" />
+    </linearGradient>
+    <radialGradient
+       r="44"
+       fy="1053.6022"
+       fx="549.57959"
+       cy="1053.6022"
+       cx="549.57959"
+       gradientTransform="matrix(1.3773467,-1.791245e-7,1.7912446e-7,1.3773464,-207.83681,-395.55015)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6576-6"
+       xlink:href="#linearGradient3541-12-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3541-12-0">
+      <stop
+         id="stop3543-20-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0.30514973"
+         id="stop5354-2-1" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0.63298833"
+         id="stop5352-17-3" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0.85721445"
+         id="stop3545-51-0" />
+      <stop
+         id="stop3547-7-2"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4264-7-7-4-6"
+       id="linearGradient6869-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1428.7632,365.14783)"
+       x1="720.7771"
+       y1="374.90027"
+       x2="717.61865"
+       y2="363.11279" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4264-7-7-4-6">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4266-78-1-3-0" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop4268-2-9-7-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4264-8-1-0-9-5"
+       id="linearGradient6872-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.64285714,307.36277,-268.66396)"
+       x1="720.7771"
+       y1="374.90027"
+       x2="717.61865"
+       y2="363.11279" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4264-8-1-0-9-5">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4266-7-9-5-9-4" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop4268-3-7-7-3-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4244-6-5"
+       id="radialGradient5610-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7727271,0,0,1.7727271,-417.97349,-794.04003)"
+       cx="540.90698"
+       cy="1027.5814"
+       fx="540.90698"
+       fy="1027.5814"
+       r="45.023254" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4244-6-5">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop4246-6-3" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop4248-9-8" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath12885-6">
+      <path
+         transform="translate(-8,-8)"
+         d="m 600,1068 a 44,44 0 1 1 -88,0 44,44 0 1 1 88,0 z"
+         sodipodi:ry="44"
+         sodipodi:rx="44"
+         sodipodi:cy="1068"
+         sodipodi:cx="556"
+         id="path12888-7"
+         style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+         sodipodi:type="arc" />
+    </clipPath>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12863-6"
+       id="radialGradient5612-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1388493,0,0,1.200468,-77.200227,-214.605)"
+       cx="556"
+       cy="1063.7086"
+       fx="556"
+       fy="1063.7086"
+       r="44" />
+    <linearGradient
+       id="linearGradient12863-6">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop12865-0" />
+      <stop
+         id="stop12871-2"
+         offset="0.62350565"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0.8054316"
+         id="stop12873-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12867-9" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12897-0"
+       id="radialGradient5614-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8604586,0,0,1.8604586,-459.48492,-891.43519)"
+       cx="540.88086"
+       cy="1031.9064"
+       fx="540.88086"
+       fy="1031.9064"
+       r="44" />
+    <linearGradient
+       id="linearGradient12897-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop12899-8" />
+      <stop
+         id="stop3397-7"
+         offset="0.23620702"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop12901-65" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter12907-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.89191478"
+         id="feGaussianBlur12909-4" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3580-0"
+       id="linearGradient5616-0"
+       gradientUnits="userSpaceOnUse"
+       x1="534.77368"
+       y1="1093.9681"
+       x2="576.95667"
+       y2="1020.9051" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3580-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3582-6" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3584-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient6781-5"
+       gradientUnits="userSpaceOnUse"
+       x1="143.99997"
+       y1="106.25386"
+       x2="143.99997"
+       y2="91.980705" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5530-4">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop5532-9" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop5534-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient3511"
+       gradientUnits="userSpaceOnUse"
+       x1="143.99997"
+       y1="106.25386"
+       x2="143.99997"
+       y2="91.980705" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient6783-6"
+       gradientUnits="userSpaceOnUse"
+       x1="143.77536"
+       y1="235.92043"
+       x2="143.77536"
+       y2="221.91942" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient3526"
+       gradientUnits="userSpaceOnUse"
+       x1="143.77536"
+       y1="235.92043"
+       x2="143.77536"
+       y2="221.91942" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient6785-8"
+       gradientUnits="userSpaceOnUse"
+       x1="211.0293"
+       y1="170.50592"
+       x2="211.0293"
+       y2="157.49393" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient3541"
+       gradientUnits="userSpaceOnUse"
+       x1="211.0293"
+       y1="170.50592"
+       x2="211.0293"
+       y2="157.49393" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient6787-3"
+       gradientUnits="userSpaceOnUse"
+       x1="77.136726"
+       y1="170.73593"
+       x2="77.136726"
+       y2="157.23462" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5530-4"
+       id="linearGradient3556"
+       gradientUnits="userSpaceOnUse"
+       x1="77.136726"
+       y1="170.73593"
+       x2="77.136726"
+       y2="157.23462" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4849-8-4-3"
+       id="linearGradient5626-2"
+       gradientUnits="userSpaceOnUse"
+       x1="556"
+       y1="1111.3027"
+       x2="552.65161"
+       y2="1085.869" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4849-8-4-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4851-7-8-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4853-4-4-2" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4857-9-6-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.88"
+         id="feGaussianBlur4859-2-9-4" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3453-8"
+       id="linearGradient5606-7"
+       gradientUnits="userSpaceOnUse"
+       x1="582.04169"
+       y1="1102.4139"
+       x2="582.04169"
+       y2="1023.9925" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3453-8">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3455-3" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3457-6" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3449-7"
+       x="-0.21977592"
+       width="1.4395518"
+       y="-0.21977592"
+       height="1.4395518">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="8.05845"
+         id="feGaussianBlur3451-8" />
+    </filter>
+    <linearGradient
+       y2="1023.9925"
+       x2="582.04169"
+       y1="1102.4139"
+       x1="582.04169"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7629"
+       xlink:href="#linearGradient3453-8"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="1023.9925"
+       x2="582.04169"
+       y1="1102.4139"
+       x1="582.04169"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3637"
+       xlink:href="#linearGradient3453-8"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1400"
+     inkscape:window-height="975"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3644">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <g
+       style="display:inline;enable-background:new"
+       id="use6074"
+       transform="matrix(0.22542576,0,0,0.23295729,-7.4507583,988.13468)">
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.4;fill:url(#linearGradient5606-7);fill-opacity:1;stroke:none;display:inline;filter:url(#filter3449-7);enable-background:new"
+         id="path4544"
+         sodipodi:cx="556"
+         sodipodi:cy="1068"
+         sodipodi:rx="44"
+         sodipodi:ry="44"
+         d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+         transform="matrix(1.7516202,0,0,0.4743969,-829.90078,-260.99919)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.8;fill:url(#linearGradient3637);fill-opacity:1;stroke:none;display:inline;filter:url(#filter3449-7);enable-background:new"
+         id="path4546"
+         sodipodi:cx="556"
+         sodipodi:cy="1068"
+         sodipodi:rx="44"
+         sodipodi:ry="44"
+         d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+         transform="matrix(1.2481235,0,0,0.3380333,-549.95657,-111.36283)" />
+    </g>
+    <g
+       style="display:inline;enable-background:new"
+       id="use6076"
+       transform="translate(-694.9789,648.3622)">
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#radialGradient5610-5);stroke-width:4.19047403;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+         id="path4448"
+         sodipodi:cx="556"
+         sodipodi:cy="1068"
+         sodipodi:rx="44"
+         sodipodi:ry="44"
+         d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+         transform="matrix(0.47727297,0,0,0.47727297,454.63624,-130.72752)" />
+      <g
+         id="g4450"
+         transform="matrix(0.21875002,0,0,0.21875002,688.5,343.125)">
+        <g
+           style="display:inline;enable-background:new"
+           id="g4452"
+           transform="matrix(2.1818181,0,0,2.1818181,-1051.6363,-2148.7272)">
+          <g
+             clip-path="url(#clipPath12885-6)"
+             id="g4454">
+            <path
+               sodipodi:type="arc"
+               style="fill:url(#radialGradient5612-3);fill-opacity:1;stroke:none"
+               id="path4456"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="translate(-8,-8)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:url(#radialGradient5614-3);fill-opacity:1;stroke:none;display:inline"
+               id="path4458"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="translate(-8.0000005,-8)" />
+            <path
+               transform="matrix(0.83749189,0,0,0.83749189,82.354503,165.55866)"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               sodipodi:ry="44"
+               sodipodi:rx="44"
+               sodipodi:cy="1068"
+               sodipodi:cx="556"
+               id="path4460"
+               style="fill:#888a85;stroke:#888a85;stroke-width:5.00360203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter12907-2)"
+               sodipodi:type="arc" />
+          </g>
+          <path
+             transform="matrix(0.805203,0,0,0.805203,100.30713,200.04319)"
+             d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+             sodipodi:ry="44"
+             sodipodi:rx="44"
+             sodipodi:cy="1068"
+             sodipodi:cx="556"
+             id="path4462"
+             style="fill:#888a85;stroke:#2e3436;stroke-width:2.60212398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter12907-2)"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g4464"
+           transform="translate(10,0)">
+          <path
+             transform="matrix(1.7662308,0,0,1.7662308,-848.02435,-1722.3347)"
+             d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+             sodipodi:ry="44"
+             sodipodi:rx="44"
+             sodipodi:cy="1068"
+             sodipodi:cx="556"
+             id="path4466"
+             style="fill:url(#linearGradient5616-0);fill-opacity:1;stroke:none;display:inline;enable-background:new"
+             sodipodi:type="arc" />
+          <g
+             transform="matrix(1.0456695,0,0,1.0456695,-16.576394,-7.4897813)"
+             style="opacity:0.2;fill:#000000"
+             id="g4468">
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4470"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(0.05904885,0.03409187,-0.03409187,0.05904885,180.07888,25.689011)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4472"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(0.05904885,0.03409187,-0.03409187,0.05904885,115.07888,138.27231)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4474"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(0.03409187,0.05904885,-0.05904885,0.03409187,244.40066,62.258638)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4476"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(0.03409187,0.05904885,-0.05904885,0.03409187,131.81736,127.25864)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4478"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(-0.05904885,0.03409187,0.03409187,0.05904885,107.92096,25.689013)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4480"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(-0.05904885,0.03409187,0.03409187,0.05904885,172.92096,138.27231)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4482"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(-0.03409187,0.05904885,0.05904885,0.03409187,43.599175,62.258632)" />
+            <path
+               sodipodi:type="arc"
+               style="fill:#000000;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+               id="path4484"
+               sodipodi:cx="556"
+               sodipodi:cy="1068"
+               sodipodi:rx="44"
+               sodipodi:ry="44"
+               d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+               transform="matrix(-0.03409187,0.05904885,0.05904885,0.03409187,156.18248,127.25863)" />
+          </g>
+          <g
+             transform="translate(-10,0)"
+             id="g4486">
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:4.57142782;display:inline;enable-background:new;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="143.77536"
+               y="106.96484"
+               id="text4488"><tspan
+                 sodipodi:role="line"
+                 id="tspan4490"
+                 x="143.77536"
+                 y="106.96484"
+                 style="stroke-width:4.57142782">12</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:url(#linearGradient6781-5);fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="143.77536"
+               y="105.96484"
+               id="text4492"><tspan
+                 sodipodi:role="line"
+                 id="tspan4494"
+                 x="143.77536"
+                 y="105.96484"
+                 style="fill:url(#linearGradient6781-5);fill-opacity:1">12</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:4.57142782;display:inline;enable-background:new;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="143.77536"
+               y="236.80469"
+               id="text4496"><tspan
+                 sodipodi:role="line"
+                 id="tspan4498"
+                 x="143.77536"
+                 y="236.80469"
+                 style="stroke-width:4.57142782">6</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:url(#linearGradient6783-6);stroke:none;display:inline;enable-background:new;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="143.77536"
+               y="235.80469"
+               id="text4500"><tspan
+                 sodipodi:role="line"
+                 id="tspan4502"
+                 x="143.77536"
+                 y="235.80469"
+                 style="fill:url(#linearGradient6783-6)">6</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:4.57142782;display:inline;enable-background:new;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="211.16602"
+               y="171.87004"
+               id="text4504"><tspan
+                 sodipodi:role="line"
+                 id="tspan4506"
+                 x="211.16602"
+                 y="171.87004"
+                 style="stroke-width:4.57142782">3</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:url(#linearGradient6785-8);stroke:none;display:inline;enable-background:new;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="211.16602"
+               y="170.87004"
+               id="text4508"><tspan
+                 sodipodi:role="line"
+                 id="tspan4510"
+                 x="211.16602"
+                 y="170.87004"
+                 style="fill:url(#linearGradient6785-8)">3</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:4.57142782;display:inline;enable-background:new;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="77.166023"
+               y="171.87004"
+               id="text4512"><tspan
+                 sodipodi:role="line"
+                 id="tspan4514"
+                 x="77.166023"
+                 y="171.87004"
+                 style="stroke-width:4.57142782">9</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:url(#linearGradient6787-3);stroke:none;display:inline;enable-background:new;font-family:Liberation Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+               x="77.166023"
+               y="170.87004"
+               id="text4516"><tspan
+                 sodipodi:role="line"
+                 id="tspan4518"
+                 x="77.166023"
+                 y="170.87004"
+                 style="fill:url(#linearGradient6787-3)">9</tspan></text>
+          </g>
+        </g>
+      </g>
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:2.14634037;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+         id="path4520"
+         sodipodi:cx="556"
+         sodipodi:cy="1068"
+         sodipodi:rx="44"
+         sodipodi:ry="44"
+         d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+         transform="matrix(0.46590933,0,0,0.46590933,460.95442,-118.59116)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.5550661;fill:none;stroke:url(#linearGradient5626-2);stroke-width:2.39686704;stroke-miterlimit:4;stroke-dasharray:none;display:inline;filter:url(#filter4857-9-6-2);enable-background:new"
+         id="path4522"
+         sodipodi:cx="556"
+         sodipodi:cy="1068"
+         sodipodi:rx="44"
+         sodipodi:ry="44"
+         d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+         transform="matrix(0.41721124,0,0,0.41721124,488.15556,-66.58162)" />
+    </g>
+    <rect
+       style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+       id="rect4262-7-7-9-0-7"
+       width="2"
+       height="9"
+       x="1027.3629"
+       y="-35.021137"
+       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:transform-center-x="-4.5" />
+    <rect
+       style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+       id="rect4262-77-9-6-1"
+       width="2"
+       height="14"
+       x="-710.46991"
+       y="730.85492"
+       inkscape:transform-center-y="-4.9497476"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:transform-center-x="4.9497489" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient6872-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+       id="rect4262-7-7-8-1"
+       width="2"
+       height="9"
+       x="1026.3629"
+       y="-34.021137"
+       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:transform-center-x="-4.5" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient6869-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+       id="rect4262-77-97-1"
+       width="2"
+       height="14"
+       x="-709.76282"
+       y="730.14783"
+       inkscape:transform-center-y="-4.9497476"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:transform-center-x="4.9497489" />
+    <path
+       transform="matrix(0.05681172,0,0,0.05681172,-6.5661183,966.68757)"
+       d="m 600,1068 a 44,44 0 1 1 -88,0 44,44 0 1 1 88,0 z"
+       sodipodi:ry="44"
+       sodipodi:rx="44"
+       sodipodi:cy="1068"
+       sodipodi:cx="556"
+       id="use4604-0-7"
+       style="fill:url(#radialGradient6576-6);fill-opacity:1;stroke:#555753;stroke-width:17.6020031;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new"
+       sodipodi:type="arc" />
+    <g
+       style="display:inline;enable-background:new"
+       transform="matrix(0.94444449,0,0,0.94444449,-654.97894,669.41774)"
+       id="use6078">
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.7;fill:url(#radialGradient6295-0);fill-opacity:1;stroke:#babdb6;stroke-width:2.66218281;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new"
+         id="path4438"
+         sodipodi:cx="556"
+         sodipodi:cy="1068"
+         sodipodi:rx="44"
+         sodipodi:ry="44"
+         d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+         transform="matrix(0.39772755,0,0,0.39772755,498.86347,-45.773011)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.86976743;fill:url(#radialGradient6297-8);fill-opacity:1;stroke:none;display:inline;enable-background:new"
+         id="path4440"
+         sodipodi:cx="556"
+         sodipodi:cy="1068"
+         sodipodi:rx="44"
+         sodipodi:ry="44"
+         d="m 600,1068 c 0,24.3005 -19.69947,44 -44,44 -24.30053,0 -44,-19.6995 -44,-44 0,-24.3005 19.69947,-44 44,-44 24.30053,0 44,19.6995 44,44 z"
+         transform="matrix(0.25911855,0,0,0.15265075,575.93008,206.95338)" />
+    </g>
+  </g>
+</svg>

=== added file 'panels/datetime/settings-shared.h'
--- panels/datetime/settings-shared.h	1970-01-01 00:00:00 +0000
+++ panels/datetime/settings-shared.h	2014-03-03 10:09:16 +0000
@@ -0,0 +1,50 @@
+/*
+An indicator to show date and time information.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __DATETIME_SETTINGS_SHARED_H__
+#define __DATETIME_SETTINGS_SHARED_H__
+
+typedef enum
+{
+  TIME_FORMAT_MODE_LOCALE_DEFAULT,
+  TIME_FORMAT_MODE_12_HOUR,
+  TIME_FORMAT_MODE_24_HOUR,
+  TIME_FORMAT_MODE_CUSTOM
+}
+TimeFormatMode;
+
+#define SETTINGS_INTERFACE              "com.canonical.indicator.datetime"
+#define SETTINGS_SHOW_CLOCK_S           "show-clock"
+#define SETTINGS_TIME_FORMAT_S          "time-format"
+#define SETTINGS_SHOW_SECONDS_S         "show-seconds"
+#define SETTINGS_SHOW_DAY_S             "show-day"
+#define SETTINGS_SHOW_DATE_S            "show-date"
+#define SETTINGS_SHOW_YEAR_S            "show-year"
+#define SETTINGS_CUSTOM_TIME_FORMAT_S   "custom-time-format"
+#define SETTINGS_SHOW_CALENDAR_S        "show-calendar"
+#define SETTINGS_SHOW_WEEK_NUMBERS_S    "show-week-numbers"
+#define SETTINGS_SHOW_EVENTS_S          "show-events"
+#define SETTINGS_SHOW_LOCATIONS_S       "show-locations"
+#define SETTINGS_SHOW_DETECTED_S        "show-auto-detected-location"
+#define SETTINGS_LOCATIONS_S            "locations"
+#define SETTINGS_TIMEZONE_NAME_S        "timezone-name"
+
+#endif

=== added file 'panels/datetime/unity-datetime-panel.desktop.in.in'
--- panels/datetime/unity-datetime-panel.desktop.in.in	1970-01-01 00:00:00 +0000
+++ panels/datetime/unity-datetime-panel.desktop.in.in	2014-03-03 10:09:16 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+_Name=Time & Date
+_Comment=Change your clock and date settings
+Icon=unity-datetime-panel
+TryExec=unity-control-center
+Exec=unity-control-center datetime
+StartupNotify=true
+Type=Application
+Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
+X-Unity-Settings-Panel=datetime
+OnlyShowIn=Unity;

=== added file 'panels/datetime/utils.c'
--- panels/datetime/utils.c	1970-01-01 00:00:00 +0000
+++ panels/datetime/utils.c	2014-03-03 10:09:16 +0000
@@ -0,0 +1,468 @@
+/* -*- Mode: C; coding: utf-8; indent-tabs-mode: nil; tab-width: 2 -*-
+
+A dialog for setting time and date preferences.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Michael Terry <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
+
+#include <glib/gi18n-lib.h>