rpms/evolution-rss/F-7 evolution-rss-0.0.8-norss-enabled.patch, NONE, 1.1 evolution-rss.spec, 1.6, 1.7

[Lucian Langa (lucilanga)]

Author: lucilanga

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

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.0.8-norss-enabled.patch 
Log Message:
fix no feed enabled

evolution-rss-0.0.8-norss-enabled.patch:

--- NEW FILE evolution-rss-0.0.8-norss-enabled.patch ---
Index: evolution-rss/src/rss.c
===================================================================
--- evolution-rss/src/rss.c	(.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_0_8/src/rss.c)	(revision 229)
+++ evolution-rss/src/rss.c	(.../evolution-rss/src/rss.c)	(working copy)
@@ -2775,6 +2775,12 @@
 
 void org_gnome_cooly_rss_refresh(void *ep, EMPopupTargetSelect *t);
 
+gboolean 
+check_if_enabled (gpointer key, gpointer value, gpointer user_data)
+{
+       return value;
+}
+
 void
 org_gnome_cooly_rss_refresh(void *ep, EMPopupTargetSelect *t)
 {
@@ -2791,6 +2797,10 @@
 	if (!rf->online)
 		return;
 
+       //no feeds enabled
+       if (!g_hash_table_find(rf->hre, check_if_enabled, NULL))
+               return;
+
         if (!rf->setup || g_hash_table_size(rf->hrname)<1)
         {
                 e_error_run(NULL,
@@ -2799,15 +2809,6 @@
 			NULL);
                 return;
         }
-	if (!feeds_enabled())
-	{
-                e_error_run(NULL,
-			"org-gnome-evolution-rss:feederr",
-			_("No RSS feeds enabled!"),
-			_("Go to Edit->Preferences->News & Blogs to enable feeds."),
-			NULL);
-                return;
-	}
 	readrss_dialog = e_error_new(NULL, 
 		"org-gnome-evolution-rss:readrss",
                 _("Reading RSS feeds..."),
@@ -2902,6 +2903,10 @@
 
 	rf->t = t;
 
+       //no feeds enabled
+       if (!g_hash_table_find(rf->hre, check_if_enabled, NULL))
+               return;
+
 	if (!rf->setup || g_hash_table_size(rf->hrname)<1)
 	{
 		e_error_run(NULL, "org-gnome-evolution-rss:generr", "No RSS feeds configured!", NULL);


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-7/evolution-rss.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-rss.spec	24 Mar 2008 13:42:11 -0000	1.6
+++ evolution-rss.spec	26 Mar 2008 10:16:34 -0000	1.7
@@ -1,12 +1,13 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
 Patch0: evolution-rss-0.0.8-empty-desc.patch
 Patch1: evolution-rss-0.0.8-norss-popup.patch
+Patch2: evolution-rss-0.0.8-norss-enabled.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Requires: evolution
@@ -30,6 +31,7 @@
 %setup -q -n evolution-rss-%{version}
 %patch0 -p1 -b .empty-fix
 %patch1 -p1 -b .norss-popup
+%patch2 -p1 -b .norss-enabled
 
 %build
 %configure --disable-webkit
@@ -89,6 +91,9 @@
 %doc TODO
 
 %changelog
+* Thu Mar 26 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-5
+- No feeds enabled patch
+
 * Thu Mar 24 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-4
 - Fixed wrong function def in previous patch