[evolution-rss] let evolution manage proxy connections

[Lucian Langa <lucilanga src gnome org>]

commit 37cabb6e32813b04364e6e66080f601dfd5843e9
Author: Lucian Langa <lucilanga gnome org>
Date:   Tue Apr 28 23:55:38 2009 +0300

    let evolution manage proxy connections
---
 ChangeLog          |    5 +++
 TODO               |    2 -
 configure.ac       |    1 +
 src/network-soup.c |   85 +++++++++++++--------------------------------------
 src/rss.c          |    1 +
 5 files changed, 29 insertions(+), 65 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a91db6..618f405 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-28  Lucian Langa  <lucilanga gnome org>
+
+	* src/network-soup.c: let evolution manage proxy connections
+	* src/rss.c (e_plugin_lib_enable): init proxy
+
 2009-04-24  Lucian Langa  <lucilanga gnome org>
 
 	Fix for #580116:
diff --git a/TODO b/TODO
index aa76748..f74bb73 100644
--- a/TODO
+++ b/TODO
@@ -58,7 +58,5 @@
 	* perform feeds images update weekly
 	* disable filters on setup_feed()
 	* check s&r progress bar on Complete.
-	* support https proxy
-	* support list of ignored hosts
 	* store feed in an alternate file to serve images from
 	* migrate fetch_blocking -> fetch_unblocking
diff --git a/configure.ac b/configure.ac
index 5c4dd9e..a5a401b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
    evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
    evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
    libglade-2.0 dnl
+   libgtkhtml-3.14 dnl
 ])
 
 dnl default renderer and fall it it in case no other render is found
diff --git a/src/network-soup.c b/src/network-soup.c
index 081112c..7fe8418 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -20,6 +20,7 @@
 
 #include <string.h>
 //#include <libsoup/soup-gnome.h>
+#include <libedataserver/e-proxy.h>
 
 #include "network.h"
 #include "rss.h"
@@ -31,6 +32,7 @@
 
 gint proxy_type = 0;
 extern rssfeed *rf;
+EProxy *proxy;
 
 typedef struct {
 	NetStatusCallback user_cb;
@@ -174,73 +176,30 @@ unblock_free (gpointer user_data, GObject *ex_msg)
 		g_object_unref(user_data);
 }
 
-//this will insert proxy in the session
-void
-proxify_session(SoupSession *session)
+EProxy *
+proxy_init(void)
 {
-#if (EVOLUTION_VERSION < 22300)		// include devel too
-    gboolean use_proxy =
-   	gconf_client_get_bool(rss_gconf, GCONF_KEY_USE_PROXY, NULL);
-    gint port_proxy =
-        gconf_client_get_int(rss_gconf, GCONF_KEY_PORT_PROXY, NULL);
-    gchar *host_proxy =
-        gconf_client_get_string(rss_gconf, GCONF_KEY_HOST_PROXY, NULL);
-    gboolean auth_proxy =
-        gconf_client_get_bool(rss_gconf, GCONF_KEY_AUTH_PROXY, NULL);
-    gchar *user_proxy =
-        gconf_client_get_string(rss_gconf, GCONF_KEY_USER_PROXY, NULL);
-    gchar *pass_proxy =
-        gconf_client_get_string(rss_gconf, GCONF_KEY_PASS_PROXY, NULL);
-#else
-    gboolean use_proxy =
-   	gconf_client_get_bool(rss_gconf, RIGHT_KEY(USE_HTTP_PROXY), NULL);
-    guint proxy_type =
-   	gconf_client_get_int(rss_gconf, KEY_GCONF_EVO_PROXY_TYPE, NULL);
-    gint port_proxy =
-        gconf_client_get_int(rss_gconf, RIGHT_KEY(HTTP_PORT), NULL);
-    gchar *host_proxy =
-        gconf_client_get_string(rss_gconf, RIGHT_KEY(HTTP_HOST), NULL);
-    gboolean auth_proxy =
-        gconf_client_get_bool(rss_gconf, RIGHT_KEY(HTTP_USE_AUTH), NULL);
-#endif
-
-    if (use_proxy && host_proxy && port_proxy > 0)
-    {
-        gchar *proxy_uri = 
-            g_strdup_printf("http://%s:%d/";, host_proxy, port_proxy); 
-	g_free(host_proxy);
-
+	EProxy *proxy;
+	proxy = e_proxy_new ();
+        e_proxy_setup_proxy (proxy);
+	return proxy;
+}
 
-	if (auth_proxy) {
-                char *tmp;
 
-		gchar *user_proxy =
-        		gconf_client_get_string(rss_gconf, RIGHT_KEY(HTTP_AUTH_USER), NULL);
-		gchar *pass_proxy =
-			gconf_client_get_string(rss_gconf, RIGHT_KEY(HTTP_AUTH_PWD), NULL);
+//this will insert proxy in the session
+void
+proxify_session(EProxy *proxy, SoupSession *session, gchar *uri)
+{
+	SoupURI *proxy_uri = NULL;
 
-                tmp = proxy_uri;
+	if (e_proxy_require_proxy_for_uri (proxy, uri)) {
+		proxy_uri = e_proxy_peek_uri_for (proxy, uri);
+		g_print("proxified %s with %s:%d\n", uri, proxy_uri->host, proxy_uri->port);
+	} else 
+		g_print("no PROXY-%s\n", uri);
 
-                proxy_uri = g_strdup_printf ("http://%s:%s %s", user_proxy, pass_proxy, tmp + strlen ("http://";));
+	g_object_set (G_OBJECT (session), SOUP_SESSION_PROXY_URI, proxy_uri, NULL);
 
-                g_free (user_proxy);
-                g_free (pass_proxy);
-                g_free (tmp);
-       } 
-	g_print("proxy_uri:%s\n", proxy_uri);
-#if LIBSOUP_VERSION < 2003000
-        SoupUri *puri = soup_uri_new (proxy_uri);
-#else
-        SoupURI *puri = soup_uri_new (proxy_uri);
-#endif
-       	g_object_set (G_OBJECT (session), SOUP_SESSION_PROXY_URI, puri, NULL);
-#if LIBSOUP_VERSION < 2003000
-        if (puri)
-            g_free(puri);
-#endif
-        if (proxy_uri)
-            g_free(proxy_uri);
-    }
 }
 
 guint
@@ -506,7 +465,7 @@ net_get_unblocking(const char *url,
 //		soup_session_async_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);
 		soup_session_async_new();
 			
-	proxify_session(soup_sess);
+	proxify_session(proxy, soup_sess, url);
 	if (cb && data) {
 		info = g_new0(CallbackInfo, 1);
 		info->user_cb = cb;
@@ -651,7 +610,7 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 #endif
 	g_free(agstr);
 
-	proxify_session(soup_sess);
+	proxify_session(proxy, soup_sess, url);
 	rf->b_session = soup_sess;
 	rf->b_msg_session = req;
 	soup_session_send_message(soup_sess, req);
diff --git a/src/rss.c b/src/rss.c
index 8ef4047..70962f6 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -3972,6 +3972,7 @@ e_plugin_lib_enable(EPluginLib *ep, int enable)
 			status_msg = g_queue_new();
 			get_feed_folders();
 			rss_build_stock_images();
+			proxy = proxy_init();
 			rss_soup_init();
 #if HAVE_DBUS
 			d(g_print("init_dbus()\n"));