Merge lp:~larsu/unity-control-center/datetime-use-geonames into lp:unity-control-center

[Lars Karlitski]

datetime: use libgeonames for city completion

This makes looking up cities much faster, doesn't require an internet connection, and insulates us from problems in the web service.

datetime: use libgeonames for city completion

This makes looking up cities much faster, doesn't require an internet connection, and insulates us from problems in the web service.

[Sebastien Bacher (seb128)]

nice!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2015-11-03 08:25:57 +0000
+++ configure.ac	2015-12-11 09:23:36 +0000
@@ -136,7 +136,7 @@
 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 timezonemap
+PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES timezonemap geonames
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
 PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES libunity-settings-daemon x11)
 PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 gl x11

=== modified file 'debian/control'
--- debian/control	2015-11-03 08:25:57 +0000
+++ debian/control	2015-12-11 09:23:36 +0000
@@ -25,6 +25,7 @@
                libdbus-1-dev (>= 0.32),
                libdbus-glib-1-dev (>= 0.32),
                libgdk-pixbuf2.0-dev (>= 2.23.0),
+               libgeonames-dev,
                libglib2.0-dev (>= 2.31.2),
                libgnome-bluetooth-dev (>= 3.3.4),
                libgnome-desktop-3-dev (>= 3.5.91),

=== modified file 'panels/datetime/datetime-prefs.c'
--- panels/datetime/datetime-prefs.c	2014-03-06 21:21:46 +0000
+++ panels/datetime/datetime-prefs.c	2015-12-11 09:23:36 +0000
@@ -33,7 +33,7 @@
 #include <polkit/polkit.h>
 #include <shell/cc-panel.h>
 #include <timezonemap/cc-timezone-map.h>
-#include <timezonemap/timezone-completion.h>
+#include <geonames.h>
 
 #include "settings-shared.h"
 #include "utils.h"
@@ -41,6 +41,7 @@
 
 #define DATETIME_DIALOG_UI_FILE PKGDATADIR "/ui/datetime/datetime-dialog.ui"
 
+GType indicator_datetime_panel_get_type (void);
 #define INDICATOR_DATETIME_TYPE_PANEL indicator_datetime_panel_get_type()
 
 typedef struct _IndicatorDatetimePanel IndicatorDatetimePanel;
@@ -68,7 +69,9 @@
   gboolean             changing_time;
   GtkWidget *          loc_dlg;
   GSettings *          settings;
-  CcTimezoneCompletion * completion;
+  GtkListStore *       cities_model;
+  guint                typing_timeout;
+  GCancellable *       cancellable;
 };
 
 struct _IndicatorDatetimePanelClass
@@ -76,6 +79,14 @@
   CcPanelClass parent_class;
 };
 
+enum
+{
+  COL_NAME,
+  COL_ADMIN1,
+  COL_COUNTRY,
+  COL_ZONE
+};
+
 G_DEFINE_DYNAMIC_TYPE (IndicatorDatetimePanel, indicator_datetime_panel, CC_TYPE_PANEL)
 
 /* Turns the boolean property into a string gsettings */
@@ -580,30 +591,10 @@
   const gchar * name, * zone;
 
   gtk_tree_model_get (model, iter,
-                      CC_TIMEZONE_COMPLETION_NAME, &name,
-                      CC_TIMEZONE_COMPLETION_ZONE, &zone,
+                      COL_NAME, &name,
+                      COL_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);
@@ -614,6 +605,48 @@
 }
 
 static gboolean
+match_city_func (GtkEntryCompletion *completion,
+                 const gchar        *key,
+                 GtkTreeIter        *iter,
+                 gpointer            user_data)
+{
+  /* the model only ever contains cities that already match the text in
+   * the location entry, so it's safe to always accept matches */
+  return TRUE;
+}
+
+static void
+cell_data_func (GtkCellLayout   *cell_layout,
+                GtkCellRenderer *cell,
+                GtkTreeModel    *tree_model,
+                GtkTreeIter     *iter,
+                gpointer         user_data)
+{
+  gchar *name;
+  gchar *admin1;
+  gchar *country;
+  gchar *text;
+
+  gtk_tree_model_get (tree_model, iter,
+                      COL_NAME, &name,
+                      COL_ADMIN1, &admin1,
+                      COL_COUNTRY, &country,
+                      -1);
+
+  if (admin1[0] != '\0')
+    text = g_strdup_printf ("%s <small>(%s, %s)</small>", name, admin1, country);
+  else
+    text = g_strdup_printf ("%s <small>(%s)</small>", name, country);
+
+  g_object_set (cell, "markup", text, NULL);
+
+  g_free (name);
+  g_free (admin1);
+  g_free (country);
+  g_free (text);
+}
+
+static gboolean
 entry_focus_out (GtkEntry * entry,
                  GdkEventFocus * event G_GNUC_UNUSED,
                  IndicatorDatetimePanel * self)
@@ -642,10 +675,86 @@
 }
 
 static void
+query_cities_callback (GObject      *source_object,
+                       GAsyncResult *result,
+                       gpointer      user_data)
+{
+  IndicatorDatetimePanel *self = user_data;
+  gint *indices;
+  guint len;
+  guint i;
+  GtkEntryCompletion *completion;
+
+  gtk_list_store_clear (self->priv->cities_model);
+
+  indices = geonames_query_cities_finish (result, &len, NULL);
+  if (indices == NULL)
+    return;
+
+  for (i = 0; i < len; i++)
+    {
+      GeonamesCity *city;
+      GtkTreeIter iter;
+
+      city = geonames_get_city (indices[i]);
+
+      gtk_list_store_append (self->priv->cities_model, &iter);
+      gtk_list_store_set (self->priv->cities_model, &iter,
+                          COL_NAME, geonames_city_get_name (city),
+                          COL_ADMIN1, geonames_city_get_state (city),
+                          COL_COUNTRY, geonames_city_get_country (city),
+                          COL_ZONE, geonames_city_get_timezone (city),
+                          -1);
+
+      geonames_city_free (city);
+    }
+
+  completion = gtk_entry_get_completion (GTK_ENTRY (self->priv->tz_entry));
+  gtk_entry_completion_complete (completion);
+
+  g_free (indices);
+}
+
+static gboolean
+typing_timeout (gpointer user_data)
+{
+  IndicatorDatetimePanel *self = user_data;
+  const gchar *query;
+
+  if (self->priv->cancellable)
+    {
+      g_cancellable_cancel (self->priv->cancellable);
+      g_object_unref (self->priv->cancellable);
+    }
+
+  self->priv->cancellable = g_cancellable_new ();
+  query = gtk_entry_get_text (GTK_ENTRY (self->priv->tz_entry));
+
+  geonames_query_cities (query, GEONAMES_QUERY_DEFAULT, self->priv->cancellable, query_cities_callback, self);
+
+  self->priv->typing_timeout = 0;
+  return G_SOURCE_REMOVE;
+}
+
+static void
+entry_changed (GtkEntry *entry,
+               gpointer  user_data)
+{
+  IndicatorDatetimePanel *self = user_data;
+
+  if (self->priv->typing_timeout > 0)
+    g_source_remove (self->priv->typing_timeout);
+
+  self->priv->typing_timeout = g_timeout_add (100, typing_timeout, self);
+}
+
+static void
 indicator_datetime_panel_init (IndicatorDatetimePanel * self)
 {
   GError * error;
   GSettings * conf;
+  GtkEntryCompletion *completion;
+  GtkCellRenderer *renderer;
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
                                             INDICATOR_DATETIME_TYPE_PANEL,
@@ -685,9 +794,21 @@
   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);
+  self->priv->cities_model = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+
+  completion = gtk_entry_completion_new ();
+  gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (self->priv->cities_model));
+  gtk_entry_completion_set_minimum_key_length (completion, 2);
+  g_object_set (G_OBJECT (completion), "text-column", COL_NAME,  NULL); /* use this, because the setter adds a renderer */
+  gtk_entry_completion_set_match_func (completion, match_city_func, NULL, NULL);
+  g_signal_connect (completion, "match-selected", G_CALLBACK (timezone_selected), self);
+
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE);
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, cell_data_func, NULL, NULL);
+
+  gtk_entry_set_completion (GTK_ENTRY (WIG ("timezoneEntry")), completion);
+  g_signal_connect (WIG ("timezoneEntry"), "changed", G_CALLBACK (entry_changed), self);
   g_signal_connect (WIG ("timezoneEntry"), "focus-out-event", G_CALLBACK (entry_focus_out), self);
 
   /* Set up settings bindings */
@@ -767,6 +888,8 @@
 
   gtk_widget_show_all (panel);
   gtk_container_add (GTK_CONTAINER (self), panel);
+
+  g_object_unref (completion);
 }
 
 static void
@@ -794,11 +917,6 @@
     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;
@@ -814,6 +932,19 @@
     priv->date_spin = NULL;
   }
 
+  g_clear_object (&priv->cities_model);
+
+  if (priv->typing_timeout) {
+    g_source_remove (priv->typing_timeout);
+    priv->typing_timeout = 0;
+  }
+
+  if (self->priv->cancellable)
+    {
+      g_cancellable_cancel (self->priv->cancellable);
+      g_clear_object (&self->priv->cancellable);
+    }
+
   G_OBJECT_CLASS (indicator_datetime_panel_parent_class)->dispose (object);
 }