Small fixes (#40)

* Throw an error for dbus errors

* Move curl setup to download function

Move curl initialization to download function to workaround a dbus cycle
error.

* Move to debug output and fix pac data freeing

3 files changed, 12 insertions, 10 deletions

diff --git a/src/backend/dbus/dbus.c b/src/backend/dbus/dbus.c
index 0dd7d75..4352082 100644
--- a/src/backend/dbus/dbus.c
+++ b/src/backend/dbus/dbus.c
@@ -124,7 +124,7 @@ on_name_lost (GDBusConnection *connection,
     g_warning ("Can't connect proxy bus");
     g_main_loop_quit (user_data);
   } else {
-    g_warning ("Unknown name lost error");
+    g_error ("Unknown name lost error");
   }
 }
 
diff --git a/src/backend/plugins/download-curl/download-curl.c b/src/backend/plugins/download-curl/download-curl.c
index 25228bf..9396076 100644
--- a/src/backend/plugins/download-curl/download-curl.c
+++ b/src/backend/plugins/download-curl/download-curl.c
@@ -38,7 +38,6 @@ G_DEFINE_FINAL_TYPE_WITH_CODE (PxDownloadCurl,
 static void
 px_download_curl_init (PxDownloadCurl *self)
 {
-  self->curl = curl_easy_init ();
 }
 
 static void
@@ -69,6 +68,9 @@ px_download_curl_download (PxDownload *download,
   CURLcode res;
   const char *url = uri;
 
+  if (!self->curl)
+    self->curl = curl_easy_init ();
+
   if (g_str_has_prefix (url, "pac+"))
     url += 4;
 
diff --git a/src/backend/px-manager.c b/src/backend/px-manager.c
index 9fe2682..7ef2675 100644
--- a/src/backend/px-manager.c
+++ b/src/backend/px-manager.c
@@ -76,7 +76,7 @@ px_manager_on_network_changed (GNetworkMonitor *monitor,
 
   self->wpad = FALSE;
   g_clear_pointer (&self->pac_url, g_free);
-  g_clear_object (&self->pac_data);
+  g_clear_pointer (&self->pac_data, g_bytes_unref);
 }
 
 static void
@@ -247,7 +247,7 @@ download_pac (PeasExtensionSet *set,
   PxDownloadInterface *ifc = PX_DOWNLOAD_GET_IFACE (extension);
   struct DownloadData *download_data = data;
 
-  g_print ("%s: Download PAC using plugin '%s'\n", __FUNCTION__, peas_plugin_info_get_module_name (info));
+  g_debug ("%s: Download PAC using plugin '%s'\n", __FUNCTION__, peas_plugin_info_get_module_name (info));
   if (!download_data->bytes)
     download_data->bytes = ifc->download (PX_DOWNLOAD (extension), download_data->uri);
 }
@@ -294,7 +294,7 @@ get_config (PeasExtensionSet *set,
   PxConfigInterface *ifc = PX_CONFIG_GET_IFACE (extension);
   struct ConfigData *config_data = data;
 
-  g_print ("%s: Asking plugin '%s' for configuration\n", __FUNCTION__, peas_plugin_info_get_module_name (info));
+  g_debug ("%s: Asking plugin '%s' for configuration\n", __FUNCTION__, peas_plugin_info_get_module_name (info));
   ifc->get_config (PX_CONFIG (extension), config_data->uri, config_data->builder, config_data->error);
 }
 
@@ -401,7 +401,7 @@ px_manager_expand_wpad (PxManager *self,
     ret = TRUE;
 
     if (!self->wpad) {
-      g_clear_object (&self->pac_data);
+      g_clear_pointer (&self->pac_data, g_bytes_unref);
       g_clear_pointer (&self->pac_url, g_free);
       self->wpad = TRUE;
     }
@@ -409,7 +409,7 @@ px_manager_expand_wpad (PxManager *self,
     if (!self->pac_data) {
       GUri *wpad_url = g_uri_parse ("http://wpad/wpad.dat", G_URI_FLAGS_PARSE_RELAXED, NULL);
 
-      g_print ("Trying to find the PAC using WPAD...\n");
+      g_debug ("Trying to find the PAC using WPAD...\n");
       self->pac_url = g_uri_to_string (wpad_url);
       self->pac_data = px_manager_pac_download (self, self->pac_url);
       if (!self->pac_data) {
@@ -440,7 +440,7 @@ px_manager_expand_pac (PxManager *self,
 
       if (g_strcmp0 (self->pac_url, uri_str) != 0) {
         g_clear_pointer (&self->pac_url, g_free);
-        g_clear_object (&self->pac_data);
+        g_clear_pointer (&self->pac_data, g_bytes_unref);
       }
     }
 
@@ -485,11 +485,11 @@ px_manager_get_proxies_sync (PxManager   *self,
   /* TODO: Check topology */
   config = px_manager_get_configuration (self, uri, error);
 
-  g_print ("Config is:\n");
+  g_debug ("Config is:\n");
   for (int idx = 0; idx < g_strv_length (config); idx++) {
     GUri *conf_url = g_uri_parse (config[idx], G_URI_FLAGS_PARSE_RELAXED, NULL);
 
-    g_print ("\t- %s\n", config[idx]);
+    g_debug ("\t- %s\n", config[idx]);
 
     if (px_manager_expand_wpad (self, conf_url) || px_manager_expand_pac (self, conf_url)) {
       struct PacData pac_data = {