rpms/evolution-rss/devel evolution-rss-0.1.4-folder-properties.patch, NONE, 1.1 evolution-rss-0.1.4-folder-rename.patch, NONE, 1.1 evolution-rss.spec, 1.34, 1.35

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6257

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-folder-properties.patch 
	evolution-rss-0.1.4-folder-rename.patch 
Log Message:
* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
- added upstream patch to fix folder rename (#594704)

evolution-rss-0.1.4-folder-properties.patch:
 rss-config-factory.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE evolution-rss-0.1.4-folder-properties.patch ---
diff -urN evolution-rss-0.1.4.orig/src/rss-config-factory.c evolution-rss-0.1.4/src/rss-config-factory.c
--- evolution-rss-0.1.4.orig/src/rss-config-factory.c	2009-08-26 09:24:36.000000000 +0100
+++ evolution-rss-0.1.4/src/rss-config-factory.c	2009-09-15 23:27:13.787560110 +0100
@@ -2192,7 +2192,15 @@
 	add_feed *feed = (add_feed *)g_object_get_data((GObject *)epl, "add-feed");
 	gchar *url = (gchar *)g_object_get_data((GObject *)epl, "url");
 	gchar *ofolder = (gchar *)g_object_get_data((GObject *)epl, "ofolder");
+
+	EMConfigTargetFolder *targetfolder = (EMConfigTargetFolder *)target->config->target;
+	gchar *main_folder = lookup_main_folder();
+	gchar *folder = targetfolder->folder->full_name;
 	
+	if (folder == NULL
+          || g_ascii_strncasecmp(folder, main_folder, strlen(main_folder))
+          || !g_ascii_strcasecmp(folder, main_folder))
+                return;
 
 	GtkWidget *entry1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "url_entry");
         GtkWidget *checkbutton1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "html_check");


evolution-rss-0.1.4-folder-rename.patch:
 rss.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE evolution-rss-0.1.4-folder-rename.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 12:00:09.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-09-16 12:30:32.000000000 +0300
@@ -3659,8 +3659,13 @@
 		nname = g_strdup(new_name);
 	gchar *orig_name = g_hash_table_lookup(rf->feed_folders, oname);
 	if (!orig_name) {
-		if (valid_folder)
-			return 0;
+		if (valid_folder) {
+			gchar *ofolder = lookup_original_folder(old_name);
+			if (!ofolder)
+				return 0;
+			else if (!lookup_key(ofolder))
+				return 0;
+		}
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(oname));
 	} else {
 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(orig_name));


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- evolution-rss.spec	26 Aug 2009 12:09:58 -0000	1.34
+++ evolution-rss.spec	16 Sep 2009 09:39:38 -0000	1.35
@@ -11,11 +11,13 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	2%{?dist}
+Release:	4%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
+Patch0:		evolution-rss-0.1.4-folder-rename.patch
+Patch1:		evolution-rss-0.1.4-folder-properties.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -39,6 +41,8 @@ This is an evolution plugin which enable
 
 %prep
 %setup -q -n evolution-rss-%{version}
+%patch0 -p1 -b .folder-rename
+%patch1 -p1 -b .folder-properties
 
 %build
 %configure --with-primary-render=gecko
@@ -92,6 +96,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
+- added upstream patch to fix folder rename (#594704)
+
 * Wed Aug 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-2
 - fix source0