rpms/evolution-rss/F-12 evolution-rss-0.1.4-opml-fix.patch, NONE, 1.1 evolution-rss.spec, 1.42, 1.43

[Lucian Langa]

Author: lucilanga

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

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-opml-fix.patch 
Log Message:
fix for bug #542206

evolution-rss-0.1.4-opml-fix.patch:
 rss-config-factory.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE evolution-rss-0.1.4-opml-fix.patch ---
diff -Naur evolution-rss-0.1.4/src/rss-config-factory.c evolution-rss-0.1.4-mod/src/rss-config-factory.c
--- evolution-rss-0.1.4/src/rss-config-factory.c	2009-08-26 11:24:36.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss-config-factory.c	2009-12-07 23:27:32.000000000 +0200
@@ -1300,8 +1300,9 @@
 	if (type == 0) {
 	gint size = 0;
 	gchar *base = NULL, *root = NULL, *last = NULL;
-	gchar *rssprefix = NULL, *rssurl = NULL, *rsstitle = NULL;
+	gchar *rssprefix = NULL;
 	while (src) {
+		gchar *rssurl = NULL, *rsstitle = NULL;
 		if (rf->cancel) {
 			if (src) xmlFree(src);
 			rf->cancel = 0;
@@ -1348,6 +1349,8 @@
 				} else if (strcmp(prop, "link")) {
 					rssprefix = root;
 					rssurl = (gchar *)xmlGetProp(src, (xmlChar *)"xmlUrl");
+					if (!rssurl)
+						goto fail;
 					rsstitle = (gchar *)xmlGetProp(src, (xmlChar *)"title");
 					gtk_label_set_text(GTK_LABEL(import_label), (gchar *)rsstitle);
 #if GTK_VERSION >= 2006000
@@ -1357,7 +1360,7 @@
 					import_one_feed(rssurl, rsstitle, rssprefix);
 					if (rssurl) xmlFree(rssurl);
 					if (rsstitle) xmlFree(rsstitle);
-                        		while (gtk_events_pending ())
+fail:					while (gtk_events_pending ())
                                 		gtk_main_iteration ();
 					current++;
 					float fr = ((current*100)/total);


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- evolution-rss.spec	26 Nov 2009 12:22:13 -0000	1.42
+++ evolution-rss.spec	8 Dec 2009 07:48:51 -0000	1.43
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	10%{?dist}
+Release:	11%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -23,6 +23,7 @@ Patch3:		evolution-rss-0.1.4-recv-feeds3
 Patch4:		evolution-rss-0.1.4-sanitize-icon.patch
 Patch5:		evolution-rss-0.1.4-empty-source.patch
 Patch6:		evolution-rss-0.1.4-reject-empty-url.patch
+Patch7:		evolution-rss-0.1.4-reject-empty-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -53,6 +54,7 @@ This is an evolution plugin which enable
 %patch4 -p1 -b .sanitize-icon
 %patch5 -p1 -b .empty-source
 %patch6 -p1 -b .reject-empty-url
+%patch7 -p1 -b .opml-fix
 
 %build
 %configure --with-primary-render=gecko
@@ -106,6 +108,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Tue Dec 08 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-11
+- fix for bug #542206
+
 * Thu Nov 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-10
 - add 2 upstream patches that fixes possible crashes