Merge lp:~larsu/timezonemap/lp1440157 into lp:timezonemap

[Lars Karlitski]

Merge lp:~larsu/timezonemap/lp1440157

Use libsoup directly instead of gio, fix a few memory leaks, and don't reuse cancellables (as per GCancellable docs).

[Iain Lane (laney)]

Thanks!

Going to upload later.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-02-02 11:58:25 +0000
+++ configure.ac	2015-05-07 14:10:56 +0000
@@ -50,11 +50,13 @@
 GLIB_REQUIRED_VERSION=2.26
 GTK3_REQUIRED_VERSION=3.1.4
 GIO_REQUIRED_VERSION=2.5.11
+SOUP_REQUIRED_VERSION=2.42.0
 
 AC_CHECK_LIBM
 
 PKG_CHECK_MODULES(LIBTIMEZONEMAP, gio-2.0 >= $GIO_REQUIRED_VERSION
                                   gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                  libsoup-2.4 >= $SOUP_REQUIRED_VERSION
                                   json-glib-1.0)
 LIBTIMEZONEMAP_LIBS="$LIBTIMEZONEMAP_LIBS $LIBM"
 

=== modified file 'debian/control'
--- debian/control	2014-05-03 03:51:17 +0000
+++ debian/control	2015-05-07 14:10:56 +0000
@@ -13,6 +13,7 @@
                libgtk-3-dev (>= 3.1.4),
                libcairo2-dev (>= 1.10),
                libjson-glib-dev,
+               libsoup2.4-dev (>= 2.42.0),
                dh-autoreconf
 Standards-Version: 3.9.5
 Vcs-Bzr: http://bazaar.launchpad.net/~timezonemap-team/timezonemap/trunk

=== modified file 'src/timezone-completion.c'
--- src/timezone-completion.c	2013-11-29 11:25:40 +0000
+++ src/timezone-completion.c	2015-05-07 14:10:56 +0000
@@ -26,6 +26,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <libsoup/soup.h>
 #include "timezone-completion.h"
 #include "tz.h"
 
@@ -45,6 +46,7 @@
   GCancellable * cancel;
   gchar *        request_text;
   GHashTable *   request_table;
+  SoupSession *  soup_session;
 };
 
 #define GEONAME_URL "http://geoname-lookup.ubuntu.com/?query=%s&release=%s&lang=%s"
@@ -134,10 +136,6 @@
 
   json_parser_load_from_stream_finish (JSON_PARSER (object), res, &error);
 
-  if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) && priv->cancel) {
-    g_cancellable_reset (priv->cancel);
-  }
-
   if (error != NULL) 
     {
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@@ -271,16 +269,11 @@
   CcTimezoneCompletion * completion = CC_TIMEZONE_COMPLETION (user_data);
   CcTimezoneCompletionPrivate * priv = completion->priv;
   GError * error = NULL;
-  GFileInputStream * stream;
-
-  stream = g_file_read_finish (G_FILE (object), res, &error);
-
-  if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) && priv->cancel)
-    {
-      g_cancellable_reset (priv->cancel);
-    }
-
-  if (error != NULL)
+  GInputStream * stream;
+  SoupMessage *message;
+
+  stream = soup_request_send_finish (SOUP_REQUEST (object), res, &error);
+  if (stream == NULL)
     {
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
         save_and_use_model (completion, priv->initial_model);
@@ -290,9 +283,24 @@
       return;
     }
 
-  JsonParser * parser = json_parser_new ();
-  json_parser_load_from_stream_async (parser, G_INPUT_STREAM (stream), priv->cancel,
-                                      json_parse_ready, user_data);
+  message = soup_request_http_get_message (SOUP_REQUEST_HTTP (object));
+  if (message->status_code == SOUP_STATUS_OK)
+    {
+      JsonParser *parser;
+
+      parser = json_parser_new ();
+      json_parser_load_from_stream_async (parser, stream, priv->cancel, json_parse_ready, user_data);
+
+      g_object_unref (parser);
+    }
+  else
+    {
+      g_warning ("Unable to fetch geonames (server responded with: %u %s)",
+                 message->status_code, message->reason_phrase);
+    }
+
+  g_object_unref (message);
+  g_object_unref (stream);
 }
 
 /* Returns message locale, with possible country info too like en_US */
@@ -354,6 +362,8 @@
 request_zones (CcTimezoneCompletion * completion)
 {
   CcTimezoneCompletionPrivate * priv = completion->priv;
+  SoupRequest *req;
+  GError *error = NULL;
 
   priv->queued_request = 0;
 
@@ -366,7 +376,8 @@
   if (priv->cancel)
     {
       g_cancellable_cancel (priv->cancel);
-      g_cancellable_reset (priv->cancel);
+      g_object_unref (priv->cancel);
+      priv->cancel = g_cancellable_new ();
     }
   g_free (priv->request_text);
 
@@ -380,12 +391,19 @@
   g_free (locale);
   g_free (escaped);
 
-  GFile * file =  g_file_new_for_uri (url);
+  req = soup_session_request (priv->soup_session, url, &error);
+  if (req)
+    {
+      soup_request_send_async (req, priv->cancel, geonames_data_ready, completion);
+      g_object_unref (req);
+    }
+  else
+    {
+      g_warning ("%s", error->message);
+      g_error_free (error);
+    }
+
   g_free (url);
-
-  g_file_read_async (file, G_PRIORITY_DEFAULT, priv->cancel,
-                     geonames_data_ready, completion);
-
   return FALSE;
 }
 
@@ -678,6 +696,8 @@
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, TRUE);
   gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (self), cell, data_func, NULL, NULL);
 
+  priv->soup_session = soup_session_new ();
+
   return;
 }
 
@@ -741,6 +761,8 @@
       priv->request_table = NULL;
     }
 
+  g_clear_object (&priv->soup_session);
+
   return;
 }