rpms/evolution-rss/F-12 evolution-rss-0.1.4-folder-properties2.patch, NONE, 1.1 evolution-rss.spec, 1.46, 1.47

[Lucian Langa]

Author: lucilanga

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

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-folder-properties2.patch 
Log Message:
fix crash on folder properties (#555616)

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

--- NEW FILE evolution-rss-0.1.4-folder-properties2.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	2010-01-17 18:04:21.000000000 +0200
+++ evolution-rss-0.1.4-mod/src/rss-config-factory.c	2010-01-17 20:54:21.000000000 +0200
@@ -2189,6 +2189,7 @@
 void rss_folder_factory_commit (EPlugin *epl, EConfigTarget *target)
 {
 	const gchar *user = NULL, *pass = NULL;
+	gchar *key = NULL;
 	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");
@@ -2202,6 +2203,10 @@
           || !g_ascii_strcasecmp(folder, main_folder))
                 return;
 
+	if (!ofolder) return;
+	key = lookup_key(ofolder);
+	if (!key) return;
+
 	GtkWidget *entry1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "url_entry");
         GtkWidget *checkbutton1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "html_check");
         GtkWidget *checkbutton2 = (GtkWidget *)glade_xml_get_widget (feed->gui, "enabled_check");


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- evolution-rss.spec	25 Dec 2009 17:29:04 -0000	1.46
+++ evolution-rss.spec	17 Jan 2010 19:07:46 -0000	1.47
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	13%{?dist}
+Release:	14%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -26,6 +26,7 @@ Patch6:		evolution-rss-0.1.4-reject-empt
 Patch7:		evolution-rss-0.1.4-opml-fix.patch
 Patch8:		evolution-rss-0.1.4-status-icon.patch
 Patch9:		evolution-rss-0.1.4-vers-detect.patch
+Patch10:	evolution-rss-0.1.4-folder-properties2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -59,10 +60,10 @@ This is an evolution plugin which enable
 %patch7 -p1 -b .opml-fix
 %patch8 -p1 -b .status-icon
 %patch9 -p1 -b .vers-detect
+%patch10 -p1 -b .folder-properties2
 
 %build
-autoconf
-automake
+autoreconf
 %configure --with-primary-render=gecko
 make %{?_smp_mflags}
 
@@ -114,6 +115,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Sun Jan 17 2010 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-14
+- fix crash on folder properties (#555616)
+
 * Fri Dec 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-13
 - upstream patch to fix evo version detection