lucilanga pushed to evolution-rss (f21). "update to latest upstream"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 1 22:31:39 UTC 2015


>From 4041b53990f4ec28c5459c7169d85445ef91a26f Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga at gnome.org>
Date: Thu, 2 Apr 2015 00:31:30 +0200
Subject: update to latest upstream


diff --git a/.gitignore b/.gitignore
index c8d2841..ea1cb86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ evolution-rss-0.2.1-20100721.tar.gz
 /evolution-rss-0.3.92.tar.xz
 /evolution-rss-0.3.93.tar.xz
 /evolution-rss-0.3.94.tar.xz
+/evolution-rss-0.3.95.tar.xz
diff --git a/eds-evo-3.11.2-changes.patch b/eds-evo-3.11.2-changes.patch
deleted file mode 100644
index 6322c68..0000000
--- a/eds-evo-3.11.2-changes.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-From a9805199c18b1a8b6b2c48d83b3c78be21b2ab91 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha at redhat.com>
-Date: Fri, 29 Nov 2013 17:01:12 +0000
-Subject: Bug 712709 - Adapt to evolution-data-server/evolution 3.11.2 changes
-
----
-diff --git a/src/parser.c b/src/parser.c
-index d3b3ed6..ef20856 100644
---- a/src/parser.c
-+++ b/src/parser.c
-@@ -25,11 +25,16 @@
- #include <libxml/HTMLparser.h>
- #include <libxml/HTMLtree.h>
- #include <libxml/debugXML.h>
-+
-+#if EVOLUTION_VERSION >= 31102
-+#include <libemail-engine/libemail-engine.h>
-+#else
- #if EVOLUTION_VERSION >= 30305
- #include <libemail-engine/mail-ops.h>
- #else
- #include <mail/mail-ops.h>
- #endif
-+#endif
- #if EVOLUTION_VERSION >= 30505
- #include <mail/e-mail-reader-utils.h>
- #endif
-diff --git a/src/rss-cache.c b/src/rss-cache.c
-index b075659..65f926d 100644
---- a/src/rss-cache.c
-+++ b/src/rss-cache.c
-@@ -98,12 +98,6 @@ rss_cache_get_path(int create, const char *key)
- 	return real;
- }
- 
--CamelStream*
--rss_cache_get(gchar *url)
--{
--	return camel_data_cache_get(cache, HTTP_CACHE_PATH, url, NULL);
--}
--
- #if DATASERVER_VERSION <= 2025004
- #define CAMEL_DATA_CACHE_BITS (6)
- #define CAMEL_DATA_CACHE_MASK ((1<<CAMEL_DATA_CACHE_BITS)-1)
-@@ -145,7 +139,7 @@ rss_cache_get_filename(gchar *url)
- #endif
- }
- 
--CamelStream*
-+RssCacheStream *
- rss_cache_add(gchar *url)
- {
- 	return camel_data_cache_add(cache, HTTP_CACHE_PATH, url, NULL);
-diff --git a/src/rss-cache.h b/src/rss-cache.h
-index eabee01..845178c 100644
---- a/src/rss-cache.h
-+++ b/src/rss-cache.h
-@@ -17,14 +17,24 @@
-  * 02110-1301 USA
-  */
- 
-+#ifndef RSS_CACHE_H
-+#define RSS_CACHE_H
-+
- #if (DATASERVER_VERSION >= 2031001)
- #include <camel/camel.h>
- #else
- #include <camel/camel-data-cache.h>
- #endif
- 
-+#if (DATASERVER_VERSION >= 3011002)
-+#define RssCacheStream GIOStream
-+#else
-+#define RssCacheStream CamelStream
-+#endif
-+
- void rss_cache_init(void);
--CamelStream *rss_cache_get(gchar *url);
- gchar *rss_cache_get_filename(gchar *url);
- char* rss_cache_get_path(int create, const char *path);
--CamelStream* rss_cache_add(gchar *url);
-+RssCacheStream *rss_cache_add(gchar *url);
-+
-+#endif /* RSS_CACHE_H */
-diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
-index 84a1d6e..7105d01 100644
---- a/src/rss-config-factory.c
-+++ b/src/rss-config-factory.c
-@@ -46,6 +46,9 @@
- #endif
- 
- #include <mail/em-folder-selector.h>
-+#if EVOLUTION_VERSION >= 31102
-+#include <libemail-engine/libemail-engine.h>
-+#else
- #if EVOLUTION_VERSION >= 30305
- #include <libemail-engine/e-mail-folder-utils.h>
- #else
-@@ -53,7 +56,7 @@
- #include <mail/e-mail-folder-utils.h>
- #endif
- #endif
--
-+#endif
- 
- #include <mail/em-utils.h>
- #include <shell/e-shell.h>
-diff --git a/src/rss-evo-common.c b/src/rss-evo-common.c
-index 2f893df..0145b8c 100644
---- a/src/rss-evo-common.c
-+++ b/src/rss-evo-common.c
-@@ -26,6 +26,9 @@
- #if (EVOLUTION_VERSION < 30303)
- #include <mail/e-mail-local.h>
- #endif
-+#if EVOLUTION_VERSION >= 31102
-+#include <libemail-engine/libemail-engine.h>
-+#else
- #if EVOLUTION_VERSION >= 30305
- #include <libemail-engine/e-mail-folder-utils.h>
- #else
-@@ -33,6 +36,7 @@
- #include <mail/e-mail-folder-utils.h>
- #endif
- #endif
-+#endif
- #include <mail/e-mail-reader.h>
- #include <mail/em-folder-utils.h>
- 
-diff --git a/src/rss-image.c b/src/rss-image.c
-index 12ab7fc..9dfb636 100644
---- a/src/rss-image.c
-+++ b/src/rss-image.c
-@@ -303,7 +303,7 @@ finish_image_feedback (SoupMessage *msg, FEED_IMAGE *user_data)
- finish_image_feedback (SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE *user_data)
- #endif
- {
--	CamelStream *stream = NULL;
-+	RssCacheStream *stream = NULL;
- 	gchar *mime_type;
- 	d("finish_image_feedback()");
- 	stream = rss_cache_add(user_data->url);
-@@ -337,9 +337,9 @@ finish_image_feedback (SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE *use
- 
- void
- #if LIBSOUP_VERSION < 2003000
--finish_image (SoupMessage *msg, CamelStream *user_data)
-+finish_image (SoupMessage *msg, RssCacheStream *user_data)
- #else
--finish_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
-+finish_image (SoupSession *soup_sess, SoupMessage *msg, RssCacheStream *user_data)
- #endif
- {
- 	d("CODE:%d\n", msg->status_code);
-@@ -362,6 +362,19 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
- 				msg->response.length);
- #else
- 		if (msg->response_body->data) {
-+#if (DATASERVER_VERSION >= 3011002)
-+			GOutputStream *out;
-+
-+			out = g_io_stream_get_output_stream (user_data);
-+			g_output_stream_write_all (out, 
-+				msg->response_body->data,
-+				msg->response_body->length,
-+				NULL,
-+				NULL,
-+				NULL);
-+			g_output_stream_flush (out, NULL, NULL);
-+			g_output_stream_close (out, NULL, NULL);
-+#else
- #if (DATASERVER_VERSION >= 2033001)
- 			camel_stream_write (user_data,
- 				msg->response_body->data,
-@@ -377,6 +390,7 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
- 			camel_stream_close(user_data, NULL);
- #endif
- #endif
-+#endif
- #if (DATASERVER_VERSION >= 2031001)
- 			g_object_unref(user_data);
- #else
-@@ -384,6 +398,19 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
- #endif
- 		}
- 	} else {
-+#if (DATASERVER_VERSION >= 3011002)
-+		GOutputStream *out;
-+
-+		out = g_io_stream_get_output_stream (user_data);
-+		g_output_stream_write_all (out, 
-+			msg->response_body->data,
-+			msg->response_body->length,
-+			NULL,
-+			NULL,
-+			NULL);
-+		g_output_stream_flush (out, NULL, NULL);
-+		g_output_stream_close (out, NULL, NULL);
-+#else
- #if (DATASERVER_VERSION >= 2033001)
- 		camel_stream_write (user_data, pixfilebuf, pixfilelen, NULL, NULL);
- 		camel_stream_close (user_data, NULL, NULL);
-@@ -391,6 +418,73 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
- 		camel_stream_write(user_data, pixfilebuf, pixfilelen, NULL);
- 		camel_stream_close(user_data, NULL);
- #endif
-+#endif
-+
-+#if (DATASERVER_VERSION >= 2031001)
-+		g_object_unref(user_data);
-+#else
-+		camel_object_unref(user_data);
-+#endif
-+	}
-+}
-+
-+static void
-+#if LIBSOUP_VERSION < 2003000
-+finish_image_camel (SoupMessage *msg, CamelStream *user_data)
-+#else
-+finish_image_camel (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
-+#endif
-+{
-+	d("CODE:%d\n", msg->status_code);
-+	// we might need to handle more error codes here
-+	if (503 != msg->status_code && //handle this timedly fasion
-+	    404 != msg->status_code && //NOT FOUND
-+	    400 != msg->status_code && //bad request
-+	      2 != msg->status_code && //STATUS_CANT_RESOLVE
-+	      1 != msg->status_code && //TIMEOUT (CANCELLED) ?
-+	      7 != msg->status_code && // STATUS_IO_ERROR
-+#if LIBSOUP_VERSION < 2003000
-+		msg->response.length) {	//ZERO SIZE
-+#else
-+		msg->response_body->length) { //ZERO SIZE
-+#endif
-+#if LIBSOUP_VERSION < 2003000
-+		if (msg->response.body) {
-+			camel_stream_write(user_data,
-+				msg->response.body,
-+				msg->response.length);
-+#else
-+		if (msg->response_body->data) {
-+#if (DATASERVER_VERSION >= 2033001)
-+			camel_stream_write (user_data,
-+				msg->response_body->data,
-+				msg->response_body->length,
-+				NULL,
-+				NULL);
-+			camel_stream_close(user_data, NULL, NULL);
-+#else
-+			camel_stream_write (user_data,
-+				msg->response_body->data,
-+				msg->response_body->length,
-+				NULL);
-+			camel_stream_close(user_data, NULL);
-+#endif
-+#endif
-+#if (DATASERVER_VERSION >= 2031001)
-+			g_object_unref(user_data);
-+#else
-+			camel_object_unref(user_data);
-+#endif
-+		}
-+	} else {
-+#if (DATASERVER_VERSION >= 2033001)
-+		camel_stream_write (user_data, pixfilebuf, pixfilelen, NULL, NULL);
-+		camel_stream_close (user_data, NULL, NULL);
-+#else
-+		camel_stream_write(user_data, pixfilebuf, pixfilelen, NULL);
-+		camel_stream_close(user_data, NULL);
-+#endif
-+
- #if (DATASERVER_VERSION >= 2031001)
- 		g_object_unref(user_data);
- #else
-@@ -412,7 +506,7 @@ finish_create_icon (SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE *user_d
- 		CamelStream *feed_fs = camel_stream_fs_new_with_name(
- 					user_data->img_file,
- 					O_RDWR|O_CREAT, 0666, NULL);
--		finish_image(soup_sess, msg, feed_fs);
-+		finish_image_camel(soup_sess, msg, feed_fs);
- 		display_folder_icon(evolution_store, user_data->key);
- 	}
- 	g_free(user_data->key);
-@@ -428,7 +522,7 @@ finish_create_icon_stream (
- 	SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE *user_data)
- #endif
- {
--	finish_image(soup_sess, msg, user_data->feed_fs);
-+	finish_image_camel(soup_sess, msg, user_data->feed_fs);
- 	display_folder_icon(evolution_store, user_data->key);
- 	g_free(user_data->key);
- 	g_free(user_data);
-@@ -768,7 +862,7 @@ fetch_image_redraw(gchar *url, gchar *link, gpointer data)
- 				1,
- 				&err);
- 		} else {
--			CamelStream *stream = rss_cache_add(intern);
-+			RssCacheStream *stream = rss_cache_add(intern);
- 			fetch_unblocking(tmpurl,
- 				textcb,
- 				NULL,
-diff --git a/src/rss-image.h b/src/rss-image.h
-index 739c413..72e6853 100644
---- a/src/rss-image.h
-+++ b/src/rss-image.h
-@@ -19,6 +19,7 @@
- 
- 
- #include <mail/e-mail-reader.h>
-+#include <rss-cache.h>
- 
- typedef struct _FEED_IMAGE {
- 	gchar *img_file;
-@@ -51,10 +52,10 @@ gchar *verify_image(gchar *uri, EMailDisplay *format);
- 
- void
- #if LIBSOUP_VERSION < 2003000
--finish_image (SoupMessage *msg, CamelStream *user_data);
-+finish_image (SoupMessage *msg, RssCacheStream *user_data);
- #else
- finish_image (SoupSession *soup_sess,
--	SoupMessage *msg, CamelStream *user_data);
-+	SoupMessage *msg, RssCacheStream *user_data);
- #endif
- void
- #if LIBSOUP_VERSION < 2003000
-diff --git a/src/rss.c b/src/rss.c
-index 1dcf192..5ebf5e1 100644
---- a/src/rss.c
-+++ b/src/rss.c
-@@ -67,6 +67,9 @@ int rss_verbose_debug = 0;
- #include <mail/e-mail-reader-utils.h>
- #endif
- 
-+#if EVOLUTION_VERSION >= 31102
-+#include <libemail-engine/libemail-engine.h>
-+#else
- #if EVOLUTION_VERSION >= 30305
- #include <libemail-engine/mail-tools.h>
- #include <libemail-engine/mail-ops.h>
-@@ -82,6 +85,7 @@ int rss_verbose_debug = 0;
- #include <mail/e-mail-session.h>
- #endif
- #endif
-+#endif
- 
- #if (EVOLUTION_VERSION > 30501)
- #include <em-format/e-mail-formatter.h>
---
-cgit v0.9.2
diff --git a/evo-3.11.3-changes.patch b/evo-3.11.3-changes.patch
deleted file mode 100644
index 8fcb11c..0000000
--- a/evo-3.11.3-changes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up evolution-rss-0.3.94/src/rss-image.c.evo-3.11.3-changes evolution-rss-0.3.94/src/rss-image.c
---- evolution-rss-0.3.94/src/rss-image.c.evo-3.11.3-changes	2014-01-17 18:32:58.283903722 +0100
-+++ evolution-rss-0.3.94/src/rss-image.c	2014-01-17 18:34:36.142899575 +0100
-@@ -539,7 +539,9 @@ display_folder_icon(GtkTreeStore *tree_s
- 	GtkTreePath *path;
- 	GtkTreeRowReference *row;
- 	EMFolderTreeModel *mod = (EMFolderTreeModel *)tree_store;
-+#if (EVOLUTION_VERSION < 31103)
- 	struct _EMFolderTreeModelStoreInfo *si;
-+#endif
- 	CamelStore *store = rss_component_peek_local_store();
- 	CamelFolderInfo *rssi = NULL;
- 	gint i=0, size;
-@@ -589,9 +591,14 @@ display_folder_icon(GtkTreeStore *tree_s
- 				icon);
- 		g_free(sizes);
- 
-+#if (EVOLUTION_VERSION < 31103)
- 		si = em_folder_tree_model_lookup_store_info (
- 			EM_FOLDER_TREE_MODEL (mod), store);
- 		row = g_hash_table_lookup (si->full_hash, full_name);
-+#else
-+		row = em_folder_tree_model_get_row_reference (
-+			EM_FOLDER_TREE_MODEL (mod), store, full_name);
-+#endif
- 		if (!row) goto out;
- 		path = gtk_tree_row_reference_get_path (row);
- 		gtk_tree_model_get_iter (
diff --git a/evo-3.11.91-changes.patch b/evo-3.11.91-changes.patch
deleted file mode 100644
index f6808ed..0000000
--- a/evo-3.11.91-changes.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1439a85..cf034b0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -92,11 +92,17 @@ if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then
- 	EVOLUTION_ADDITIONAL="libemail-engine"
- fi
- 
-+EVOLUTION_PLUGIN_CHECK="evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED"
-+
-+if test "$evolution_version_int" -ge "31191"; then
-+	EVOLUTION_PLUGIN_CHECK=
-+fi
-+
- PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
- [  glib-2.0 >= $LIBGLIB_REQUIRED dnl
-    gtk+-$LIBGTK_VERSION.0 >= $LIBGTK_REQUIRED dnl
-    libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
--   evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
-+   $EVOLUTION_PLUGIN_CHECK dnl
-    evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
-    $EVOLUTION_ADDITIONAL dnl
-    libebook-1.2 dnl
-diff --git a/m4/evolution.m4 b/m4/evolution.m4
-index 2aba701..da07a5a 100644
---- a/m4/evolution.m4
-+++ b/m4/evolution.m4
-@@ -78,10 +78,17 @@ AC_SUBST(MINOR_VERSION)
- dnl Evolution plugin install directory
- AC_ARG_WITH(plugin-install-dir, [  --with-plugin-install-dir=PATH path to evolution plugin directory])
- if test "x$with_plugin_install_dir" = "x"; then
--        PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin$EVOLUTION_BASE_VERSION_S`
--        if test "x$PLUGIN_INSTALL_DIR" = "x"; then
--                AC_MSG_ERROR(Unable to find plugin directory)
--                break;
-+	if test "$evolution_version_int" -ge "031191"; then
-+		PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-shell$EVOLUTION_BASE_VERSION_S`
-+		if test "x$PLUGIN_INSTALL_DIR" = "x"; then
-+			PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=privlibdir evolution-shell$EVOLUTION_BASE_VERSION_S`/plugins
-+		fi
-+	else
-+		PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin$EVOLUTION_BASE_VERSION_S`
-+		if test "x$PLUGIN_INSTALL_DIR" = "x"; then
-+			AC_MSG_ERROR(Unable to find plugin directory)
-+			break;
-+		fi
-         fi
- fi
- AC_SUBST(PLUGIN_INSTALL_DIR)
-@@ -97,7 +104,11 @@ fi
- AC_SUBST(ICON_DIR)
- 
- dnl Evolution e-error install directory
--ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
-+if test "$evolution_version_int" -ge "031191"; then
-+	ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-shell$EVOLUTION_BASE_VERSION_S`
-+else
-+	ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
-+fi
- if test "x$ERROR_DIR" = "x"; then
-    AC_MSG_ERROR(Unable to find error file directory)
- fi
-@@ -107,7 +118,7 @@ dnl test required for bonobo server installation
- dnl dnl user might specify wrong prefix or not specify at all
- AC_ARG_WITH(bonobo-servers-dir, [  --with-bonobo-servers-dir=PATH path to bonobo servers directory])
- if test "x$with_bonobo_servers_dir" = "x" ; then
--    BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-plugin$EVOLUTION_BASE_VERSION_S`
-+    BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-shell$EVOLUTION_BASE_VERSION_S`
-     if test "x$BONOBO_LIBDIR" = "x"; then
-        AC_MSG_ERROR(Unable to find bonobo servers file directory)
-     fi
diff --git a/evolution-rss-0.3.93-convert-fix.patch b/evolution-rss-0.3.93-convert-fix.patch
deleted file mode 100644
index ad5f93f..0000000
--- a/evolution-rss-0.3.93-convert-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up evolution-rss-0.3.93/src/evolution-rss.convert.convert-fix evolution-rss-0.3.93/src/evolution-rss.convert
---- evolution-rss-0.3.93/src/evolution-rss.convert.convert-fix	2013-05-02 14:38:36.653094318 +0200
-+++ evolution-rss-0.3.93/src/evolution-rss.convert	2013-05-02 14:38:43.096174418 +0200
-@@ -1,6 +1,3 @@
--[org.gnome.evolution]
--version = /apps/evolution/version
--
- [org.gnome.evolution.plugin.rss]
- display-summary = /apps/evolution/evolution-rss/display_summary
- accept-cookies = /apps/evolution/evolution-rss/accept_cookies
diff --git a/evolution-rss-0.3.94-camel-api-changes.patch b/evolution-rss-0.3.94-camel-api-changes.patch
deleted file mode 100644
index 71a01e0..0000000
--- a/evolution-rss-0.3.94-camel-api-changes.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-commit 87ae939abd5ef896130bab49d84660309a1826d1
-Author: Lucian Langa <lucilanga at gnome.org>
-Date:   Wed Oct 9 22:32:38 2013 +0200
-
-    adapt to Camel changes
-
-diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
-index 10b4301..84a1d6e 100644
---- a/src/rss-config-factory.c
-+++ b/src/rss-config-factory.c
-@@ -1273,7 +1273,11 @@ rss_delete_folders (CamelStore *store,
- 
- 	d("call rss_delete_rec()\n");
- 	rss_delete_rec (store, fi, error);
-+#if (DATASERVER_VERSION >= 3011001)
-+	camel_folder_info_free (fi);
-+#else
- 	camel_store_free_folder_info (store, fi);
-+#endif
- }
- 
- void
-diff --git a/src/rss-image.c b/src/rss-image.c
-index 5169cb2..12ab7fc 100644
---- a/src/rss-image.c
-+++ b/src/rss-image.c
-@@ -509,7 +509,11 @@ display_folder_icon(GtkTreeStore *tree_store, gchar *key)
- 				COL_STRING_ICON_NAME, key,
- 				-1);
- 		g_free(full_name);
-+#if (DATASERVER_VERSION >= 3011001)
-+		camel_folder_info_free (rssi);
-+#else
- 		camel_store_free_folder_info (store, rssi);
-+#endif
- 		g_object_unref(pixbuf);
- 		result = TRUE;
- 	}
-diff --git a/src/rss.c b/src/rss.c
-index 4c9b06b..1dcf192 100644
---- a/src/rss.c
-+++ b/src/rss.c
-@@ -4134,7 +4134,11 @@ create_mail(create_feed *CF)
- 	camel_object_unref(new);
- 	camel_object_unref(mail_folder);
- #endif
-+#if (DATASERVER_VERSION >= 3011001)
-+	camel_message_info_unref(info);
-+#else
- 	camel_message_info_free(info);
-+#endif
- 	g_free(buf);
- }
- 
-@@ -4593,7 +4597,12 @@ delete_oldest_article(CamelFolder *folder, guint unread)
- 		}
- //		d("uid:%d j:%d/%d, absdate:%d, date:%s, imax:%d\n",
- //			i, j, q, min_date, ctime(&min_date), imax);
--out:		camel_message_info_free(info);
-+out:
-+#if (DATASERVER_VERSION >= 3011001)
-+		camel_message_info_unref(info);
-+#else
-+		camel_message_info_free(info);
-+#endif
- 	}
- 	camel_folder_freeze(folder);
- 	if (min_date) {
-@@ -4689,7 +4698,11 @@ get_feed_age(RDF *r, gpointer name)
- 						feedid);
- 					g_free(feed_name);
- 				}
-+#if (DATASERVER_VERSION >= 3011001)
-+				camel_message_info_unref(info);
-+#else
- 				camel_folder_free_message_info(folder, info);
-+#endif
- 			}
- #if (DATASERVER_VERSION >= 2031001)
- 			g_object_unref (message);
-@@ -4728,7 +4741,11 @@ get_feed_age(RDF *r, gpointer name)
- 						}
- 				}
- 			}
-+#if (DATASERVER_VERSION >= 3011001)
-+			camel_message_info_unref(info);
-+#else
- 			camel_folder_free_message_info(folder, info);
-+#endif
- 		}
- 		camel_folder_free_uids (folder, uids);
- #if (DATASERVER_VERSION >= 2033001)
diff --git a/evolution-rss-0.3.94-message-presend.patch b/evolution-rss-0.3.94-message-presend.patch
deleted file mode 100644
index c31ffe4..0000000
--- a/evolution-rss-0.3.94-message-presend.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff -up evolution-rss-0.3.94/src/e-mail-formatter-evolution-rss.c.message-presend evolution-rss-0.3.94/src/e-mail-formatter-evolution-rss.c
---- evolution-rss-0.3.94/src/e-mail-formatter-evolution-rss.c.message-presend	2013-09-23 01:33:36.000000000 +0200
-+++ evolution-rss-0.3.94/src/e-mail-formatter-evolution-rss.c	2014-07-30 16:01:25.582450411 +0200
-@@ -91,13 +91,23 @@ emfe_evolution_rss_format (EMailFormatte
- 				EMailFormatter *formatter,
- 				EMailFormatterContext *context,
- 				EMailPart *part,
-+#if EVOLUTION_VERSION < 31191
- 				CamelStream *stream,
-+#else
-+				GOutputStream *stream,
-+#endif
- 				GCancellable *cancellable)
- {
--	CamelStream *decoded_stream;
- 	CamelDataWrapper *dw;
- 	gchar *str;
-+#if EVOLUTION_VERSION < 31191
-+	CamelStream *decoded_stream;
- 	GByteArray *ba;
-+#else
-+	GOutputStream *decoded_stream;
-+	gpointer data;
-+	gsize len;
-+#endif
- 	gchar *src;
- 	CamelMimePart *message = e_mail_part_ref_mime_part (part);
- 	gchar *website, *subject, *category, *feedid, *comments;
-@@ -123,8 +133,13 @@ emfe_evolution_rss_format (EMailFormatte
- 		"height=\"0\" width=\"100%%\" data=\"%s\" id=\"%s\"></object>",
- 		e_mail_part_get_id(part),
- 		e_mail_part_get_id(part));
-+#if EVOLUTION_VERSION < 31191
- 	camel_stream_write_string (
- 		stream, str, cancellable, NULL);
-+#else
-+	g_output_stream_write_all(stream, str,
-+		strlen(str), NULL, cancellable, NULL);
-+#endif
- 	gchar *h = g_strdup(e_web_view_get_html (E_WEB_VIEW (rss_get_display())));
- 
- 	website = camel_medium_get_header (
-@@ -189,25 +204,53 @@ emfe_evolution_rss_format (EMailFormatte
- 			text_col & 0xffffff,
- 			iconfile, website, subject);
- 
-+#if EVOLUTION_VERSION < 31191
- 		camel_stream_write_string (
- 			stream, str, cancellable, NULL);
-+#else
-+		g_output_stream_write_all(stream, str,
-+			strlen(str), NULL, cancellable, NULL);
-+#endif
- 
-+#if EVOLUTION_VERSION < 31191
- 		decoded_stream = camel_stream_mem_new ();
-+#else
-+		decoded_stream = g_memory_output_stream_new_resizable ();
-+#endif
- 
- 		e_mail_formatter_format_text (
- 			formatter, part, decoded_stream, cancellable);
- 
-+#if EVOLUTION_VERSION < 31191
- 		g_seekable_seek (G_SEEKABLE (decoded_stream), 0, G_SEEK_SET, cancellable, NULL);
- 
- 		ba = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (decoded_stream));
- 		src = rss_process_feed((gchar *)ba->data, ba->len);
-+#else
-+		data = g_memory_output_stream_get_data (
-+				G_MEMORY_OUTPUT_STREAM (decoded_stream));
-+		len = g_memory_output_stream_get_data_size (
-+				G_MEMORY_OUTPUT_STREAM (decoded_stream));
-+		src = rss_process_feed((gchar *)data, len);
-+#endif
- 
-+#if EVOLUTION_VERSION < 31191
- 		camel_stream_write_string(stream, src, cancellable, NULL);
-+#else
-+		g_output_stream_write_all(stream, src, strlen(src), NULL, cancellable, NULL);
-+#endif
- 		g_free(src);
- 		g_object_unref (decoded_stream);
- 
-+#if EVOLUTION_VERSION < 31191
- 		camel_stream_write_string (
- 			stream, "</div></div>", cancellable, NULL);
-+#else
-+		gchar *tstr = g_strdup("</div></div>");
-+		g_output_stream_write_all(stream, tstr,
-+				strlen(tstr), NULL, cancellable, NULL);
-+		g_free(tstr);
-+#endif
- 	} else {
- 		GError *err = NULL;
- 		gchar *str;
-@@ -226,12 +269,27 @@ emfe_evolution_rss_format (EMailFormatte
- 				frame_col & 0xffffff,
- 				cont_col & 0xffffff,
- 				text_col & 0xffffff);
-+#if EVOLUTION_VERSION < 31191
- 			camel_stream_write_string (stream, str, cancellable, NULL);
--			g_free (str);
- 			camel_stream_write_string (stream, "<div style=\"border: solid 0px; padding: 4px;\">\n", cancellable, NULL);
- 			camel_stream_write_string (stream, "<h3>Error!</h3>", cancellable, NULL);
- 			camel_stream_write_string (stream, err->message, cancellable, NULL);
- 			camel_stream_write_string (stream, "</div>", cancellable, NULL);
-+#else
-+			g_output_stream_write_all(stream, str, strlen(str), NULL, cancellable, NULL);
-+			gchar *tstr;
-+			tstr = g_strdup("<div style=\"border: solid 0px; padding: 4px;\">\n");
-+			g_output_stream_write_all(stream, tstr, strlen(tstr), NULL, cancellable, NULL);
-+			g_free(tstr);
-+			tstr = g_strdup("<h3>Error!</h3>");
-+			g_output_stream_write_all(stream, tstr, strlen(tstr), NULL, cancellable, NULL);
-+			g_free(tstr);
-+			g_output_stream_write_all(stream, err->message, strlen(err->message), NULL, cancellable, NULL);
-+			tstr = g_strdup("</div>");
-+			g_output_stream_write_all(stream, tstr, strlen(tstr), NULL, cancellable, NULL);
-+			g_free(tstr);
-+#endif
-+			g_free (str);
- 			goto success;
- 		}
- 
-diff -up evolution-rss-0.3.94/src/parser.c.message-presend evolution-rss-0.3.94/src/parser.c
---- evolution-rss-0.3.94/src/parser.c.message-presend	2014-07-30 16:01:25.568450412 +0200
-+++ evolution-rss-0.3.94/src/parser.c	2014-07-30 16:01:25.581450411 +0200
-@@ -89,6 +89,7 @@ rss_html_url_decode(const char *html, in
- 	xmlDoc *doc = NULL;
- 	gchar *url;
- 	gchar *duri = NULL;
-+	gboolean any_changed = FALSE;
- 
- 	src = (xmlDoc *)parse_html_sux(html, len);
- 
-@@ -106,6 +107,7 @@ rss_html_url_decode(const char *html, in
- #else
- 				duri = g_strconcat("evo-file://", tmp, NULL);
- #endif
-+				any_changed = TRUE;
- 				g_free(tmp);
- 				xmlSetProp(
- 					(xmlNodePtr)doc,
-@@ -115,6 +117,12 @@ rss_html_url_decode(const char *html, in
- 			xmlFree(url);
- 		}
- 	}
-+
-+	if (!any_changed) {
-+		xmlFreeDoc(src);
-+		src = NULL;
-+	}
-+
- 	return src;
- }
- 
-diff -up evolution-rss-0.3.94/src/rss-config-factory.c.message-presend evolution-rss-0.3.94/src/rss-config-factory.c
---- evolution-rss-0.3.94/src/rss-config-factory.c.message-presend	2014-07-30 16:01:25.574450411 +0200
-+++ evolution-rss-0.3.94/src/rss-config-factory.c	2014-07-30 16:01:25.581450411 +0200
-@@ -552,11 +552,18 @@ folder_cb (GtkWidget *widget, gpointer d
- 	model = em_folder_tree_model_get_default ();
- #endif
- #if EVOLUTION_VERSION >= 30303
-+#if EVOLUTION_VERSION >= 31301
-+	dialog = em_folder_selector_new (window, model);
-+	em_folder_selector_set_can_create (EM_FOLDER_SELECTOR (dialog), TRUE);
-+	em_folder_selector_set_caption (EM_FOLDER_SELECTOR (dialog), _("Move to Folder"));
-+	em_folder_selector_set_default_button_label (EM_FOLDER_SELECTOR (dialog), _("M_ove"));
-+#else
- 	dialog = em_folder_selector_new (
- 			window,
- 			model,
- 			EM_FOLDER_SELECTOR_CAN_CREATE,
- 			_("Move to Folder"), NULL, _("M_ove"));
-+#endif
- #else
- 	dialog = em_folder_selector_new (
- 			window,
-diff -up evolution-rss-0.3.94/src/rss.c.message-presend evolution-rss-0.3.94/src/rss.c
---- evolution-rss-0.3.94/src/rss.c.message-presend	2014-07-30 16:01:25.569450412 +0200
-+++ evolution-rss-0.3.94/src/rss.c	2014-07-30 16:01:25.582450411 +0200
-@@ -1298,20 +1298,37 @@ org_gnome_evolution_presend (EPlugin *ep
- 	gsize length;
- 	gchar *text;
- 
-+#if EVOLUTION_VERSION >= 31303
-+	EHTMLEditor *editor;
-+	EHTMLEditorView *view;
-+
-+	editor = e_msg_composer_get_editor (t->composer);
-+	view = e_html_editor_get_view (editor);
-+	text = e_html_editor_view_get_text_html (view);
-+	length = strlen (text);
-+#else
- 	/* unfortunately e_msg_composer does not have raw get/set text body
- 	 * so it is far easier using gtkhtml_editor_* functions rather than
- 	 * procesing CamelMimeMessage or GByteArray
- 	 */
- 	text = gtkhtml_editor_get_text_html ((GtkhtmlEditor *)t->composer, &length);
-+#endif
- 
- 	doc = rss_html_url_decode(text, length);
- 	if (doc) {
- 		htmlDocDumpMemory(doc, &buff, &size);
- 		xmlFreeDoc(doc);
-+#if EVOLUTION_VERSION >= 31303
-+		g_free (text);
-+		text = g_strndup ((gchar *) buff, size);
-+		editor = e_msg_composer_get_editor (t->composer);
-+		view = e_html_editor_get_view (editor);
-+		e_html_editor_view_set_text_html (view, text);
-+#else
- 		gtkhtml_editor_set_text_html((GtkhtmlEditor *)t->composer, (gchar *)buff, size);
-+#endif
- 		xmlFree (buff);
--	} else
--		gtkhtml_editor_set_text_html((GtkhtmlEditor *)t->composer, (gchar *)text, length);
-+	} /* Do not touch mesage body */
- 
- 	g_free (text);
- #endif
-@@ -1386,7 +1403,7 @@ void org_gnome_cooly_folder_refresh(void
- 	gchar *ofolder, *name, *fname, *key, *rss_folder;
- 	gboolean online;
- #if EVOLUTION_VERSION > 22900 //kb//
--	CamelFolder *folder;
-+	CamelFolder *folder = NULL;
- #if EVOLUTION_VERSION >= 30505
- 	CamelStore *selected_store = NULL;
- 	gchar *selected_folder_name = NULL;
-@@ -4160,7 +4177,7 @@ get_real_channel_name(gchar *uri, gchar
- CamelMimePart *
- file_to_message(const char *filename)
- {
--	const char *type;
-+	const char *type = NULL;
- 	CamelStreamFs *file;
- 	CamelMimePart *msg = camel_mime_part_new();
- 	CamelDataWrapper *content;
diff --git a/evolution-rss-0.3.94-metainfo-file.patch b/evolution-rss-0.3.94-metainfo-file.patch
deleted file mode 100644
index b57ffe9..0000000
--- a/evolution-rss-0.3.94-metainfo-file.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From c118c1c4374f06b28aeb9629b3811930e042cd18 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
-Date: Thu, 12 Jun 2014 12:29:33 +0400
-Subject: [PATCH] Bug 731553 - add metainfo files
-
-Reference: https://bugzilla.gnome.org/show_bug.cgi?id=731553
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
----
- Makefile.am                   |  6 ++++++
- evolution-rss.metainfo.xml.in | 12 ++++++++++++
- po/POTFILES.in                |  1 +
- 3 files changed, 19 insertions(+)
- create mode 100644 evolution-rss.metainfo.xml.in
-
-diff --git a/Makefile.am b/Makefile.am
-index a3ae193..382a926 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,6 +5,11 @@ desktopdir = $(datadir)/applications
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
- 
-+appdata_in_files = evolution-rss.metainfo.xml.in
-+appdatadir = $(datadir)/appdata
-+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-+ at INTLTOOL_XML_RULE@
-+
- INTLTOOL =                      \
- 	intltool-extract.in     \
- 	intltool-merge.in       \
-@@ -22,6 +27,7 @@ EXTRA_DIST = \
- DISTCLEANFILES = \
- 	evolution-rss.desktop \
- 	evolution-rss.desktop.in \
-+	evolution-rss.metainfo.xml \
- 	intltool-extract \
- 	intltool-merge \
- 	intltool-update
-diff --git a/evolution-rss.metainfo.xml.in b/evolution-rss.metainfo.xml.in
-new file mode 100644
-index 0000000..beb9c60
---- /dev/null
-+++ b/evolution-rss.metainfo.xml.in
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
-+<component type="addon">
-+<id>evolution-rss</id>
-+<extends>evolution.desktop</extends>
-+<_name>RSS Reader</_name>
-+<_summary>Read rss feeds</_summary>
-+<url type="homepage">http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin</url>
-+<metadata_license>CC0-1.0</metadata_license>
-+<project_license>GPL-2.0 and GPL-2.0+</project_license>
-+<updatecontact>i.gnatenko.brain at gmail.com</updatecontact>
-+</component>
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 238de1d..96936bd 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -1,6 +1,7 @@
- # List of source files containing translatable strings.
- # Please keep this file sorted alphabetically.
- evolution-rss.desktop.in.in
-+evolution-rss.metainfo.xml.in
- src/dbus.c
- src/e-mail-formatter-evolution-rss.c
- src/evolution-import-rss.c
--- 
-2.0.0
-
diff --git a/evolution-rss.spec b/evolution-rss.spec
index 9c1cf43..60a2c9f 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -5,8 +5,8 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Epoch:		1
-Version:	0.3.94
-Release:	9%{?dist}
+Version:	0.3.95
+Release:	1%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -14,16 +14,6 @@ Source:		http://gnome.eu.org/%{name}-%{version}.tar.xz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
-# an upstream commit
-Patch01: evolution-rss-0.3.94-camel-api-changes.patch
-
-Patch02: eds-evo-3.11.2-changes.patch
-Patch03: evo-3.11.3-changes.patch
-Patch04: evo-3.11.91-changes.patch
-Patch05: rss-runtime.patch
-Patch06: evolution-rss-0.3.94-metainfo-file.patch
-Patch07: evolution-rss-0.3.94-message-presend.patch
-
 Requires(pre):	GConf2
 Requires(post):	GConf2
 Requires(preun):GConf2
@@ -45,13 +35,6 @@ This is an evolution plugin which enables evolution to read rss feeds.
 
 %prep
 %setup -q -n evolution-rss-%{version}
-%patch01 -p1 -b .camel-api-changes
-%patch02 -p1 -b .eds-evo-3.11.2-changes
-%patch03 -p1 -b .evo-3.11.3-changes
-%patch04 -p1 -b .evo-3.11.91-changes
-%patch05 -p1 -b .rss-runtime
-%patch06 -p1 -b .metainfo-file
-%patch07 -p1 -b .message-presend
 
 %build
 autoreconf --force --install
@@ -117,6 +100,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/evolution/*/modules/evolution-module-rss.so
 
 %changelog
+* Wed Apr 01 2015 Lucian Langa <lucilanga at gnome.eu.org> - 1:0.3.95-1
+- drop all patches - fixed upstream
+- update to latest upstream
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.3.94-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/rss-runtime.patch b/rss-runtime.patch
deleted file mode 100644
index eca007d..0000000
--- a/rss-runtime.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -up evolution-rss-0.3.94/src/misc.c.rss-runtime evolution-rss-0.3.94/src/misc.c
---- evolution-rss-0.3.94/src/misc.c.rss-runtime	2013-03-21 16:59:52.000000000 +0100
-+++ evolution-rss-0.3.94/src/misc.c	2014-03-03 15:04:45.506707094 +0100
-@@ -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 st
- 
- #endif
- 
-+gchar *
-+rss_component_peek_base_directory(void)
-+{
-+	return g_strdup_printf("%s" G_DIR_SEPARATOR_S "rss",
-+		mail_session_get_data_dir ());
-+}
-diff -up evolution-rss-0.3.94/src/misc.h.rss-runtime evolution-rss-0.3.94/src/misc.h
---- evolution-rss-0.3.94/src/misc.h.rss-runtime	2013-03-21 16:59:52.000000000 +0100
-+++ evolution-rss-0.3.94/src/misc.h	2014-03-03 15:04:45.506707094 +0100
-@@ -53,5 +53,6 @@ void write_feed_status_line(gchar *file,
- 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 -up evolution-rss-0.3.94/src/network-soup.c.rss-runtime evolution-rss-0.3.94/src/network-soup.c
---- evolution-rss-0.3.94/src/network-soup.c.rss-runtime	2013-07-25 23:35:22.000000000 +0200
-+++ evolution-rss-0.3.94/src/network-soup.c	2014-03-03 15:04:45.505707094 +0100
-@@ -288,7 +288,7 @@ proxify_webkit_session_async(EProxy *pro
- 	case 0:
- 		soup_session_add_feature_by_type (
- 			webkit_session,
--			SOUP_TYPE_PROXY_RESOLVER_GNOME);
-+			SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
- 		break;
- #endif
- 	}
-@@ -337,7 +337,7 @@ proxify_session(EProxy *proxy, SoupSessi
- #ifdef HAVE_LIBSOUP_GNOME
- 	case 0:
- 		soup_session_add_feature_by_type (
--			session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-+			session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
- 		break;
- #endif
- 	}
-@@ -464,7 +464,7 @@ proxify_session_async(EProxy *proxy, STN
- #ifdef HAVE_LIBSOUP_GNOME
- 	case 0:
- 		soup_session_add_feature_by_type (
--			stnet->ss, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-+			stnet->ss, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
- 		break;
- #endif
- 	}
-@@ -1241,7 +1241,7 @@ rss_soup_init(void)
- 		g_free(feed_dir);
- 
- 		rss_soup_jar =
--			soup_cookie_jar_sqlite_new (cookie_path, FALSE);
-+			soup_cookie_jar_db_new (cookie_path, FALSE);
- 
- 		if (!g_file_test(moz_cookie_path, G_FILE_TEST_EXISTS|G_FILE_TEST_IS_SYMLINK)) {
- 			sync_gecko_cookies();
-diff -up evolution-rss-0.3.94/src/rss-config-factory.c.rss-runtime evolution-rss-0.3.94/src/rss-config-factory.c
---- evolution-rss-0.3.94/src/rss-config-factory.c.rss-runtime	2014-03-03 15:04:45.499707094 +0100
-+++ evolution-rss-0.3.94/src/rss-config-factory.c	2014-03-03 15:04:45.506707094 +0100
-@@ -3027,7 +3027,7 @@ import_cookies(gchar *file)
- 		fclose(f);
- 		if (!g_ascii_strncasecmp(header, SQLITE_MAGIC, sizeof(SQLITE_MAGIC))) {
- #ifdef HAVE_LIBSOUP_GNOME
--			jar = soup_cookie_jar_sqlite_new(file, TRUE);
-+			jar = soup_cookie_jar_db_new(file, TRUE);
- #else
- 			g_print("Importing sqlite format requires libsoup-gnome\n");
- #endif
-diff -up evolution-rss-0.3.94/src/rss-formatter.c.rss-runtime evolution-rss-0.3.94/src/rss-formatter.c
---- evolution-rss-0.3.94/src/rss-formatter.c.rss-runtime	2013-03-21 16:59:52.000000000 +0100
-+++ evolution-rss-0.3.94/src/rss-formatter.c	2014-03-03 15:04:45.506707094 +0100
-@@ -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 -up evolution-rss-0.3.94/src/rss-formatter.h.rss-runtime evolution-rss-0.3.94/src/rss-formatter.h
---- evolution-rss-0.3.94/src/rss-formatter.h.rss-runtime	2013-03-21 16:59:52.000000000 +0100
-+++ evolution-rss-0.3.94/src/rss-formatter.h	2014-03-03 15:04:45.506707094 +0100
-@@ -28,7 +28,6 @@ gchar *rss_process_feed(gchar *feed, gui
- 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);
diff --git a/sources b/sources
index 4849f47..bea9922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77f38f8c98f64f181f74443f331c7336  evolution-rss-0.3.94.tar.xz
+41c303d15ea596a0603ecc936bd4d780  evolution-rss-0.3.95.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/evolution-rss.git/commit/?h=f21&id=4041b53990f4ec28c5459c7169d85445ef91a26f


More information about the scm-commits mailing list