Merge lp:~xnox/indicator-datetime/clickanywhere into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

[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-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-raring-armhf-ci/1

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

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

I could notice two issues related to memory management:

in sync_location(), a GSettings object is created but not g_object_unref'd.

in tz_changed(), char* name is added and it seems to me like it should be freed.

Otherwise, thanks for including the commits from Seb/Ryan I hadn't had time to merge into the branch yet :)

Note, this is the incorrect branch if you intend for this to land in raring; you'll want to merge into lp:indicator-datetime/13.04 instead. (I think this is due to the default landing branch automatically selected by Launchpad)

Assuming you indeed want to land in the other branch, please don't delete this merge, it should land in both trunks :)

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

I did propose to get this merged into /13.04 branch[1]. But I had a quick chat with seb128 and we agreed it's a bit intrusive for 13.04 & it probably also requires UIFe

[1] https://code.launchpad.net/~xnox/indicator-datetime/clickanywhere/+merge/155994

Can you please reject the /13.04 merge proposal? linked above.

I will check & try to address the memory issues.

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:29:23 +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 'data/datetime-dialog.ui'
--- data/datetime-dialog.ui	2012-05-17 20:53:17 +0000
+++ data/datetime-dialog.ui	2013-03-28 15:29:23 +0000
@@ -294,7 +294,7 @@
                           <object class="GtkRadioButton" id="automaticTimeRadio">
                             <property name="label" translatable="yes">_Automatically from the Internet</property>
                             <property name="visible">True</property>
-                            <property name="sensitive">False</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>

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-07 02:01:22 +0000
+++ debian/changelog	2013-03-28 15:29:23 +0000
@@ -1,3 +1,10 @@
+indicator-datetime (12.10.3daily13.03.27-0ubuntu1) UNRELEASED; urgency=low
+
+  * Use systemd's service backend, ffe lp: #1153567
+  * debian/control: depends on systemd-services and systemd-shim
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 26 Mar 2013 19:53:55 +0100
+
 indicator-datetime (12.10.3daily13.03.07-0ubuntu1) raring; urgency=low
 
   [ Michael Terry ]

=== modified file 'debian/control'
--- debian/control	2013-01-17 21:17:40 +0000
+++ debian/control	2013-03-28 15:29:23 +0000
@@ -40,6 +40,8 @@
          ${misc:Depends},
          gnome-control-center,
          geoclue-ubuntu-geoip | geoclue-provider,
+         systemd-services,
+         systemd-shim
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,
 Description: Simple clock

=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c	2013-03-07 15:35:04 +0000
+++ src/datetime-prefs.c	2013-03-28 15:29:23 +0000
@@ -70,8 +70,6 @@
   gboolean             changing_time;
   GtkWidget *          loc_dlg;
   CcTimezoneCompletion * completion;
-  GCancellable         * tz_query_cancel;
-  GCancellable         * ntp_query_cancel;
 };
 
 struct _IndicatorDatetimePanelClass
@@ -193,7 +191,7 @@
   GVariant * answers = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), res, &error);
 
   if (error != NULL) {
-    g_warning("Could not set '%s' for SettingsDaemon: %s", (gchar *)command, error->message);
+    g_warning("Could not set '%s' using timedated: %s", (gchar *)command, error->message);
     g_error_free(error);
     return;
   }
@@ -206,33 +204,8 @@
 {
   gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio));
 
-  g_dbus_proxy_call (self->priv->proxy, "SetUsingNtp", g_variant_new ("(b)", active),
-                     G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "using_ntp");
-}
-
-static void
-ntp_query_answered (GObject *object, GAsyncResult *res, IndicatorDatetimePanel * self)
-{
-  GError * error = NULL;
-  GVariant * answers = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), res, &error);
-
-  g_clear_object (&self->priv->ntp_query_cancel);
-
-  if (error != NULL) {
-    g_warning("Could not query DBus proxy for SettingsDaemon: %s", error->message);
-    g_error_free(error);
-    return;
-  }
-
-  gboolean can_use_ntp, is_using_ntp;
-  g_variant_get (answers, "(bb)", &can_use_ntp, &is_using_ntp);
-
-  gtk_widget_set_sensitive (GTK_WIDGET (self->priv->auto_radio), can_use_ntp);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->auto_radio), is_using_ntp);
-
-  g_signal_connect (self->priv->auto_radio, "notify::active", G_CALLBACK (toggle_ntp), self);
-
-  g_variant_unref (answers);
+  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
@@ -247,72 +220,100 @@
 }
 
 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 ("(s)", zone),
+  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);
 }
 
 static void
-tz_query_answered (GObject *object, GAsyncResult *res, IndicatorDatetimePanel * self)
-{
-  GError * error = NULL;
-  GVariant * answers = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), res, &error);
-
-  g_clear_object (&self->priv->tz_query_cancel);
-
-  if (error != NULL) {
-    g_warning("Could not query DBus proxy for SettingsDaemon: %s", error->message);
-    g_error_free(error);
-    return;
-  }
-
-  const gchar * timezone;
-  g_variant_get (answers, "(&s)", &timezone);
-
-  cc_timezone_map_set_timezone (self->priv->tzmap, timezone);
-
-  sync_entry (self, timezone);
-  g_signal_connect (self->priv->tzmap, "location-changed", G_CALLBACK (tz_changed), self);
-
-  g_variant_unref (answers);
-}
-
-static void
 proxy_ready (GObject *object, 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) {
-    g_critical("Could not grab DBus proxy for SettingsDaemon: %s", error->message);
+    g_critical("Could not grab DBus proxy for timedated: %s", error->message);
     g_error_free(error);
     return;
   }
 
   /* And now, do initial proxy configuration */
-  if (priv->ntp_query_cancel == NULL) {
-    priv->ntp_query_cancel = g_cancellable_new();
-    g_dbus_proxy_call (priv->proxy, "GetUsingNtp", NULL, G_DBUS_CALL_FLAGS_NONE, -1,
-                       priv->ntp_query_cancel, (GAsyncReadyCallback)ntp_query_answered, self);
-  }
-  if (priv->tz_query_cancel == NULL) {
-    priv->tz_query_cancel = g_cancellable_new();
-    g_dbus_proxy_call (priv->proxy, "GetTimezone", NULL, G_DBUS_CALL_FLAGS_NONE, -1,
-                       priv->tz_query_cancel, (GAsyncReadyCallback)tz_query_answered, self);
-  }
+  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);
+
+          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);
+        }
+      g_variant_unref (value);
+    }
 }
 
 static void
@@ -359,7 +360,8 @@
 {
   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 ("(x)", (guint64)current_value),
+    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;
@@ -600,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,
@@ -608,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,
@@ -626,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
 }
 
@@ -696,7 +698,7 @@
   gtk_container_add (GTK_CONTAINER (alignment), polkit_button);
   gtk_box_pack_start (GTK_BOX (WIG ("timeDateBox")), alignment, FALSE, TRUE, 0);
 
-  const gchar * polkit_name = "org.gnome.settingsdaemon.datetimemechanism.configure";
+  const gchar * polkit_name = "org.gnome.controlcenter.datetime.configure";
   polkit_permission_new (polkit_name, NULL, NULL, polkit_perm_ready, polkit_button);
 
   /* Add map */
@@ -763,9 +765,9 @@
 
   /* Grab proxy for settings daemon */
   g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL,
-                            "org.gnome.SettingsDaemon.DateTimeMechanism",
-                            "/",                            
-                            "org.gnome.SettingsDaemon.DateTimeMechanism",
+                            "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
@@ -795,16 +797,6 @@
   g_clear_object (&priv->builder);
   g_clear_object (&priv->proxy);
 
-  if (priv->tz_query_cancel != NULL) {
-    g_cancellable_cancel (priv->tz_query_cancel);
-    g_clear_object (&priv->tz_query_cancel);
-  }
-
-  if (priv->ntp_query_cancel != NULL) {
-    g_cancellable_cancel (priv->ntp_query_cancel);
-    g_clear_object (&priv->ntp_query_cancel);
-  }
-
   if (priv->loc_dlg) {
     gtk_widget_destroy (priv->loc_dlg);
     priv->loc_dlg = NULL;

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2013-02-04 15:13:42 +0000
+++ src/datetime-service.c	2013-03-28 15:29:23 +0000
@@ -277,7 +277,7 @@
   GVariant * answers = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), res, &error);
 
   if (error != NULL) {
-    g_warning("Could not set timezone for SettingsDaemon: %s", error->message);
+    g_warning("Could not set timezone using timedated: %s", error->message);
     g_clear_error (&error);
     return;
   }
@@ -293,13 +293,13 @@
 	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
 
 	if (error != NULL) {
-		g_warning("Could not grab DBus proxy for SettingsDaemon: %s", error->message);
+		g_warning("Could not grab DBus proxy for timedated: %s", error->message);
 		g_clear_error (&error);
 		g_free (zone);
 		return;
 	}
 
-	g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", zone),
+	g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(sb)", zone, TRUE),
 	                   G_DBUS_CALL_FLAGS_NONE, -1, NULL, quick_set_tz_cb, NULL);
 	g_free (zone);
 	g_object_unref (proxy);
@@ -323,9 +323,9 @@
 	g_object_unref (conf);
 
 	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL,
-	                          "org.gnome.SettingsDaemon.DateTimeMechanism",
-	                          "/",                            
-	                          "org.gnome.SettingsDaemon.DateTimeMechanism",
+	                          "org.freedesktop.timedate1",
+	                          "/org/freedesktop/timedate1",
+	                          "org.freedesktop.timedate1",
 	                          NULL, quick_set_tz_proxy_cb, g_strdup (tz));
 
 	return;

=== 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:29:23 +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,