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

[Lucian Langa (lucilanga)]

Author: lucilanga

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

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.0.8-norss-popup.patch 
Log Message:
fix #438612 - no rss feeds configured

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

--- NEW FILE evolution-rss-0.0.8-norss-popup.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)	(revision 224)
+++ evolution-rss/src/rss.c	(.../evolution-rss)	(working copy)
@@ -2793,10 +2793,7 @@
 
         if (!rf->setup || g_hash_table_size(rf->hrname)<1)
         {
-                e_error_run(NULL,
-			"org-gnome-evolution-rss:generr",
-			_("No RSS feeds configured!"),
-			NULL);
+		taskbar_push_message(_("No RSS feeds configured!"));
                 return;
         }
 	if (!feeds_enabled())
@@ -2904,7 +2901,7 @@
 
 	if (!rf->setup || g_hash_table_size(rf->hrname)<1)
 	{
-		e_error_run(NULL, "org-gnome-evolution-rss:generr", "No RSS feeds configured!", NULL);
+		taskbar_message_new(_("No RSS feeds configured!"));
 		return;
 	}
 


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/evolution-rss.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-rss.spec	22 Mar 2008 16:58:58 -0000	1.6
+++ evolution-rss.spec	23 Mar 2008 10:02:28 -0000	1.7
@@ -1,11 +1,12 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.0.8
-Release: 3%{?dist}
+Release: 4%{?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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Requires: evolution
@@ -27,7 +28,8 @@
 
 %prep
 %setup -q -n evolution-rss-%{version}
-%patch0 -p1 -b empty-fix
+%patch0 -p1 -b .empty-fix
+%patch1 -p1 -b .norss-popup
 
 %build
 %configure --disable-webkit
@@ -87,12 +89,15 @@
 %doc TODO
 
 %changelog
+* Thu Mar 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-4
+- Fix for no rss popup
+
 * Thu Mar 22 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-3
 - Upstream fix for empty description
 
 * Tue Mar  3 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-2
--Misc cleanups
--Updated to 0.0.8 version
+- Misc cleanups
+- Updated to 0.0.8 version
 
 * Tue Feb 19 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.7-8
 -Misc cleanups