rpms/evolution-rss/F-12 evolution-rss-0.1.4-recv-feeds2.patch, NONE, 1.1 evolution-rss.spec, 1.38, 1.39 evolution-rss-0.1.4-recv-feeds.patch, 1.1, NONE

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12369

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-recv-feeds2.patch 
Removed Files:
	evolution-rss-0.1.4-recv-feeds.patch 
Log Message:
add new upstream fix for feeds fetching for evolution > 2.28.1

evolution-rss-0.1.4-recv-feeds2.patch:
 rss.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE evolution-rss-0.1.4-recv-feeds2.patch ---
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-08-26 05:00:09.000000000 -0400
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-11-04 21:35:39.535483549 -0500
@@ -2812,7 +2812,11 @@
         GMutex *lock;
 
         /* states/data used during shutdown */
-        enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#if EVOLUTION_VERSION >= 22800
+	enum { MC_QUIT_NOT_START, MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#else
+	enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#endif
 };
 
 void
@@ -2829,7 +2833,7 @@
 		deleted = 1;
 
 	MailComponent *mc = mail_component_peek ();
-        if (mc->priv->quit_state != -1)
+        if (mc->priv->quit_state != MC_QUIT_NOT_START)
 		rf->cancel_all=1;
 
 	d(g_print("taskbar_op_finish() queue:%d\n", rf->feed_queue));
@@ -3194,7 +3198,7 @@
 {
 	MailComponent *mc = mail_component_peek ();
 	g_print("stAte:%d\n", mc->priv->quit_state);
-        if (mc->priv->quit_state != -1)
+        if (mc->priv->quit_state != MC_QUIT_NOT_START)
 		rf->cancel=1;
 
 	if (!rf->pending && !rf->feed_queue && !rf->cancel_all && rf->online) {


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- evolution-rss.spec	26 Oct 2009 20:52:48 -0000	1.38
+++ evolution-rss.spec	5 Nov 2009 19:36:24 -0000	1.39
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -19,7 +19,7 @@ Source:		http://gnome.eu.org/%{name}-%{v
 Patch0:		evolution-rss-0.1.4-folder-rename.patch
 Patch1:		evolution-rss-0.1.4-folder-properties.patch
 Patch2:		evolution-rss-0.1.4-icon-size.patch
-Patch3:		evolution-rss-0.1.4-recv-feeds.patch
+Patch3:		evolution-rss-0.1.4-recv-feeds2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -100,6 +100,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Thu Nov 05 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-7
+- add new upstream fix for feeds fetching for evolution > 2.28.1
+
 * Mon Oct 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-6
 - add upstream patch to fix loading of feeds for evo >= 2.28.1
 


--- evolution-rss-0.1.4-recv-feeds.patch DELETED ---