[evolution-rss/f19] add runtime fixes and proxy fixes patches

[Lucian Langa]

commit 7f85c8cf774b78ea47d469a2ace9dae95575ff01
Author: Lucian Langa <lucilanga at gnome.org>
Date:   Sat Apr 5 02:18:41 2014 +0200

    add runtime fixes and proxy fixes patches

 rss-proxy.patch   |   47 +++++++++++++++++++++++++++++++++++++
 rss-runtime.patch |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 0 deletions(-)
---
diff --git a/rss-proxy.patch b/rss-proxy.patch
new file mode 100644
index 0000000..b1b47b2
--- /dev/null
+++ b/rss-proxy.patch
@@ -0,0 +1,47 @@
+diff --git a/src/rss-evo-common.c b/src/rss-evo-common.c
+index 0145b8c..1a96862 100644
+--- a/src/rss-evo-common.c
++++ b/src/rss-evo-common.c
+@@ -242,21 +242,28 @@ rss_ipv6_network_addr (const struct in6_addr *addr, const struct in6_addr *mask,
+ gboolean
+ rss_ep_need_proxy_http (EProxy* proxy, const gchar * host, SoupAddress *addr)
+ {
++	SoupAddress *myaddr = NULL;
+ 	EProxyPrivate *priv = proxy->priv;
+ 	ProxyHostAddr *p_addr = NULL;
+ 	GSList *l;
+-	gint addr_len;
+-	struct sockaddr* so_addr = NULL;
++	guint status;
+ 
+ 	/* check for ignored first */
+ 	if (rss_ep_is_in_ignored (proxy, host))
+ 		return FALSE;
+ 
++	myaddr = soup_address_new (host, 0);
++        status = soup_address_resolve_sync (myaddr, NULL);
++        if (status == SOUP_STATUS_OK) {
++		gint addr_len;
++		struct sockaddr* so_addr = NULL;
++
+ #ifdef HAVE_LIBSOUP_GNOME
+-	so_addr = soup_address_get_sockaddr (addr, &addr_len);
++	so_addr = soup_address_get_sockaddr (myaddr, &addr_len);
+ #endif
+ 
+ 	if (!so_addr)
++		g_object_unref (myaddr);
+ 		return TRUE;
+ 
+ 	if (so_addr->sa_family == AF_INET) {
+@@ -307,8 +314,10 @@ rss_ep_need_proxy_http (EProxy* proxy, const gchar * host, SoupAddress *addr)
+ 			}
+ 		}
+ 	}
++	}
+ 
+ 	d(g_print ("%s needs a proxy to connect to internet\n", host));
++	g_object_unref (myaddr);
+ 	return TRUE;
+ }
+ 
diff --git a/rss-runtime.patch b/rss-runtime.patch
new file mode 100644
index 0000000..3d07a30
--- /dev/null
+++ b/rss-runtime.patch
@@ -0,0 +1,67 @@
+commit 07128e0eb85b47afbf1a3616d559638d6a97b4ce
+Author: Milan Crha <mcrha at redhat.com>
+Date:   Thu Mar 6 19:39:06 2014 +0100
+
+    Bug 720459 - evolution-rss fail to load with 3.8: Plugin Evolution RSS is missing a function named e_plugin_ui_init()
+
+diff --git a/src/misc.c b/src/misc.c
+index 3228d7a..513f0b9 100644
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -31,6 +31,7 @@
+ #include <camel/camel-mime-utils.h>
+ #endif
+ 
++#include <mail/e-mail-reader-utils.h>
+ 
+ #include "rss.h"
+ #include "parser.h"
+@@ -683,3 +684,9 @@ textcb(NetStatusType status, gpointer statusdata, gpointer data)
+ 
+ #endif
+ 
++gchar *
++rss_component_peek_base_directory(void)
++{
++	return g_strdup_printf("%s" G_DIR_SEPARATOR_S "rss",
++		mail_session_get_data_dir ());
++}
+diff --git a/src/misc.h b/src/misc.h
+index 3503513..965b6f9 100644
+--- a/src/misc.h
++++ b/src/misc.h
+@@ -53,5 +53,6 @@ void write_feed_status_line(gchar *file, gchar *needle);
+ void dup_auth_data(gchar *origurl, gchar *url);
+ void sanitize_path_separator(gchar *);
+ void textcb(NetStatusType status, gpointer statusdata, gpointer data);
++gchar *rss_component_peek_base_directory(void);
+ 
+ #endif
+diff --git a/src/rss-formatter.c b/src/rss-formatter.c
+index fda3488..a118ff3 100644
+--- a/src/rss-formatter.c
++++ b/src/rss-formatter.c
+@@ -172,11 +172,3 @@ rss_get_display(void)
+ 	reader = E_MAIL_READER (shell_content);
+ 	return e_mail_reader_get_mail_display (reader);
+ }
+-
+-gchar *
+-rss_component_peek_base_directory(void)
+-{
+-	return g_strdup_printf("%s" G_DIR_SEPARATOR_S "rss",
+-		mail_session_get_data_dir ());
+-}
+-
+diff --git a/src/rss-formatter.h b/src/rss-formatter.h
+index 6a2fcf3..2884072 100644
+--- a/src/rss-formatter.h
++++ b/src/rss-formatter.h
+@@ -28,7 +28,6 @@ gchar *rss_process_feed(gchar *feed, guint len);
+ gchar *rss_process_website(gchar *content, gchar *website);
+ gboolean rss_get_current_view(void);
+ void rss_set_current_view(gboolean value);
+-gchar *rss_component_peek_base_directory(void);
+ gboolean rss_get_changed_view(void);
+ void rss_set_changed_view(gboolean value);
+ gboolean rss_get_is_html(gchar *feedid);