Merge lp:~xnox/indicator-datetime/clickanywhere into lp:indicator-datetime/13.04

[Dimitri John Ledkov]

Set a pin point based on the selected town instead of closest timezone (LP: #892370)

Set a pin point based on the selected town instead of closest timezone (LP: #892370)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/indicator-datetime-13.04-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-13.04-raring-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-13.04-raring-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-13.04-ci/3/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

rejected as requested.

review: Disapprove

Unmerged revisions

214. By Dimitri John Ledkov on 2013-03-28

Set a pin point based on the selected town instead of closest timezone

=== modified file 'data/com.canonical.indicator.datetime.gschema.xml'
--- data/com.canonical.indicator.datetime.gschema.xml	2012-07-13 15:52:55 +0000
+++ data/com.canonical.indicator.datetime.gschema.xml	2013-03-28 15:30:34 +0000
@@ -114,5 +114,19 @@
 			  Some timezones can be known by many different cities or names.  This setting describes how the current zone prefers to be named.  Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston).
 			</description>
 		</key>
+		<key name="location-longitude" type="d">
+			<default>0.0</default>
+			<summary>The longitude of the current location</summary>
+			<description>
+			  Some timezones can be known by many different cities or names.  This setting describes the longitudinal component of the coordinate for the location in timezone-name above.
+			</description>
+		</key>
+		<key name="location-latitude" type="d">
+			<default>0.0</default>
+			<summary>The latitude of the current location</summary>
+			<description>
+			  Some timezones can be known by many different cities or names.  This setting describes the latitudinal component of the coordinate for the location in timezone-name above.
+			</description>
+		</key>
 	</schema>
 </schemalist>
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-28 12:44:47 +0000
+++ debian/changelog	2013-03-28 15:30:34 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 indicator-datetime (12.10.3daily13.03.26-0ubuntu1) raring; urgency=low
+=======
+indicator-datetime (12.10.3daily13.03.27-0ubuntu1) UNRELEASED; urgency=low
+>>>>>>> MERGE-SOURCE
 
   * Use systemd's service backend, ffe lp: #1153567
   * debian/control: depends on systemd-services and systemd-shim
 
=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c	2013-03-26 20:42:11 +0000
+++ src/datetime-prefs.c	2013-03-28 15:30:34 +0000
@@ -220,18 +220,30 @@
 }
 
 static void
+sync_location (IndicatorDatetimePanel * self, const gchar * en_name)
+{
+  gtk_entry_set_text (GTK_ENTRY (self->priv->tz_entry), en_name);
+  gtk_entry_set_icon_from_stock (GTK_ENTRY (self->priv->tz_entry),
+                                 GTK_ENTRY_ICON_SECONDARY, NULL);
+
+  GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
+  g_settings_set_string (conf, SETTINGS_TIMEZONE_NAME_S, en_name);
+}  
+
+static void
 tz_changed (CcTimezoneMap * map, CcTimezoneLocation * location, IndicatorDatetimePanel * self)
 {
   if (location == NULL)
     return;
 
-  gchar * zone;
+  gchar * zone, * name;
   g_object_get (location, "zone", &zone, NULL);
+  g_object_get (location, "en_name", &name, 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);
+  sync_location (self, name);
 
   g_free (zone);
 }
@@ -278,7 +290,25 @@
         {
           const gchar *timezone = g_variant_get_string (value, NULL);
 
-          cc_timezone_map_set_timezone (priv->tzmap, timezone);
+          GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
+          gdouble lon = g_settings_get_double(conf, SETTINGS_LOCATION_LONGITUDE);
+          gdouble lat = g_settings_get_double(conf, SETTINGS_LOCATION_LATITUDE);
+          gchar * saved_tz = g_settings_get_string (conf, SETTINGS_TIMEZONE_NAME_S);
+          gchar * saved_zone, * saved_name;
+
+          split_settings_location (saved_tz, &saved_zone, &saved_name);
+
+          if (g_strcmp0 (saved_zone, timezone) == 0) {
+                  cc_timezone_map_set_location (self->priv->tzmap, lon, lat);
+          } else {
+                  cc_timezone_map_set_timezone (self->priv->tzmap, timezone);
+          }
+
+          g_free (saved_tz);
+          g_free (saved_zone);
+          g_free (saved_name);
+          g_object_unref (conf);
+
           sync_entry (self, timezone);
           g_signal_connect (priv->tzmap, "location-changed", G_CALLBACK (tz_changed), self);
         }
@@ -572,6 +602,7 @@
                    GtkTreeIter * iter, IndicatorDatetimePanel * self)
 {
   const gchar * name, * zone;
+  gdouble lon = 0.0, lat = 0.0;
 
   gtk_tree_model_get (model, iter,
                       CC_TIMEZONE_COMPLETION_NAME, &name,
@@ -580,7 +611,6 @@
 
   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,
@@ -598,14 +628,14 @@
     zone = cc_timezone_map_get_timezone_at_coords (self->priv->tzmap, lon, lat);
   }
 
+  cc_timezone_map_set_location (self->priv->tzmap, lon, lat);
+
   GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
   gchar * tz_name = g_strdup_printf ("%s %s", zone, name);
   g_settings_set_string (conf, SETTINGS_TIMEZONE_NAME_S, tz_name);
   g_free (tz_name);
   g_object_unref (conf);
 
-  cc_timezone_map_set_timezone (self->priv->tzmap, zone);
-
   return FALSE; // Do normal action too
 }
 
 
=== modified file 'src/settings-shared.h'
--- src/settings-shared.h	2012-05-17 20:46:42 +0000
+++ src/settings-shared.h	2013-03-28 15:30:34 +0000
@@ -36,6 +36,8 @@
 #define SETTINGS_SHOW_DETECTED_S        "show-auto-detected-location"
 #define SETTINGS_LOCATIONS_S            "locations"
 #define SETTINGS_TIMEZONE_NAME_S        "timezone-name"
+#define SETTINGS_LOCATION_LONGITUDE     "location-longitude"
+#define SETTINGS_LOCATION_LATITUDE      "location-latitude"
 
 enum {
 	SETTINGS_TIME_LOCALE = 0,