rpms/evolution-rss/F-9 evolution-rss-0.1.0-firefox-import.patch, NONE, 1.1 evolution-rss.spec, 1.16, 1.17

[Lucian Langa (lucilanga)]

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26619

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.0-firefox-import.patch 
Log Message:
 - Fix firefox import RH bug #452322

evolution-rss-0.1.0-firefox-import.patch:

--- NEW FILE evolution-rss-0.1.0-firefox-import.patch ---
Index: src/misc.c
===================================================================
--- src/misc.c	(.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/misc.c)	(revision 333)
+++ src/misc.c	(.../src/misc.c)	(working copy)
@@ -65,6 +65,8 @@
 {
 	if (strstr(text, "feed//"))
 		text = strextr(text, "feed//");
+	if (strstr(text, "feed:"))
+		text = strextr(text, "feed:");
 	if (strstr(text, "feed://"))
 		text = strextr(text, "feed://");
  	if (!strstr (text, "http://") 
Index: src/network-soup.c
===================================================================
--- src/network-soup.c	(.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/network-soup.c)	(revision 333)
+++ src/network-soup.c	(.../src/network-soup.c)	(working copy)
@@ -488,7 +488,7 @@
 
 	if (!rf->b_session)
 		rf->b_session = soup_sess = 
-			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);
+			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);		
 	else
 		soup_sess = rf->b_session;
 
@@ -499,14 +499,14 @@
             G_CALLBACK (reauthenticate), soup_sess);
 #endif
 
-	suri = soup_uri_new(url);
-	if (!suri)
+	req = soup_message_new(SOUP_METHOD_GET, url);
+	if (!req)
 	{
 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
 				soup_status_get_phrase(2));			//invalid url
 		goto out;
 	}
-	req = soup_message_new_from_uri(SOUP_METHOD_GET, suri);
+	d(g_print("request ok :%d\n", req->status_code));
 	g_signal_connect(G_OBJECT(req), "got-chunk",
 			G_CALLBACK(got_chunk_blocking_cb), &info);
 	for (; headers; headers = headers->next) {


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-9/evolution-rss.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- evolution-rss.spec	2 Jul 2008 16:02:23 -0000	1.16
+++ evolution-rss.spec	5 Jul 2008 15:59:05 -0000	1.17
@@ -1,10 +1,11 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
+Patch0: evolution-rss-0.1.0-firefox-import.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Requires: evolution
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q -n evolution-rss-%{version}
+%patch0 -p0 -b .firefox
 
 %build
 %configure --with-primary-render=gecko
@@ -87,6 +89,9 @@
 %doc TODO
 
 %changelog
+* Sat Jul  5 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.0-2
+- Fix firefox import RH bug #452322
+
 * Wed Jul  2 2008 Lucian Langa <cooly at gnome.eu.org> - 0.1.0-1
 - Update to 0.1.0 version