rpms/evolution-rss/F-9 evolution-rss-0.0.8-norss-enabled.patch, NONE, 1.1 evolution-rss-0.0.8-xulrunner.patch, NONE, 1.1 evolution-rss.spec, 1.12, 1.13
Lucian Langa (lucilanga)
fedora-extras-commits at redhat.com
Sat Mar 29 19:48:20 UTC 2008
Author: lucilanga
Update of /cvs/pkgs/rpms/evolution-rss/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22383
Modified Files:
evolution-rss.spec
Added Files:
evolution-rss-0.0.8-norss-enabled.patch
evolution-rss-0.0.8-xulrunner.patch
Log Message:
patch for xulrunner
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);
evolution-rss-0.0.8-xulrunner.patch:
--- NEW FILE evolution-rss-0.0.8-xulrunner.patch ---
Index: evolution-rss-patch/src/rss.c
===================================================================
--- evolution-rss-patch/src/rss.c (.../http://svn.gnome.oorg/svn/evolution-rss/trunk) (revision 231)
+++ evolution-rss-patch/src/rss.c (.../evolution-rss-patch) (working copy)
@@ -85,8 +85,12 @@
#ifdef HAVE_RENDERKIT
#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_LIBXUL
+#include <gtkembedmoz/gtkmozembed.h>
+#else
#include <gtkmozembed.h>
#endif
+#endif
#ifdef HAVE_OLD_WEBKIT
#include "webkitgtkglobal.h"
@@ -1512,7 +1516,7 @@
gtk_widget_set_size_request((GtkWidget *)data, width, height);
// apparently resizing gtkmozembed widget won't redraw if using xulrunner
// there is no point in reload for the rest
-#ifdef HAVE_XULRUNNER
+#if defined(HAVE_XULRUNNER) || defined(HAVE_LIBXUL)
gtk_moz_embed_reload(rf->mozembed, GTK_MOZ_EMBED_FLAG_RELOADNORMAL);
#endif
}
@@ -1527,7 +1531,13 @@
g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
g_unsetenv("MOZILLA_FIVE_HOME");
+// this means xulrunner at least 1.9
+#ifdef HAVE_LIBXUL
+ gtk_moz_embed_set_path(GECKO_HOME);
+#else
gtk_moz_embed_set_comp_path(GECKO_HOME);
+#endif
+
gchar *profile_dir = g_build_filename (g_get_home_dir (),
".evolution",
"mail",
Index: evolution-rss-patch/src/Makefile.am
===================================================================
--- evolution-rss-patch/src/Makefile.am (.../http://svn.gnome.oorg/svn/evolution-rss/trunk) (revision 231)
+++ evolution-rss-patch/src/Makefile.am (.../evolution-rss-patch) (working copy)
@@ -3,6 +3,7 @@
-I$(EVOLUTION_SOURCE) \
-I$(top_srcdir) \
$(GECKO_CFLAGS) \
+ -I$(GECKO_INCLUDE_ROOT) \
$(WEBKIT_CFLAGS) \
$(DBUS_CFLAGS) \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-9/evolution-rss.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- evolution-rss.spec 24 Mar 2008 13:26:15 -0000 1.12
+++ evolution-rss.spec 29 Mar 2008 19:47:42 -0000 1.13
@@ -1,12 +1,14 @@
Summary: Evolution RSS Reader
Name: evolution-rss
Version: 0.0.8
-Release: 5%{?dist}
+Release: 6%{?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
+Patch3: evolution-rss-0.0.8-xulrunner.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
Requires: evolution
@@ -20,6 +22,7 @@
BuildRequires: evolution-data-server-devel
BuildRequires: dbus-glib-devel
BuildRequires: gecko-libs = 1.9
+BuildRequires: xulrunner-devel
BuildRequires: perl(XML::Parser)
BuildRequires: libtool
@@ -30,6 +33,8 @@
%setup -q -n evolution-rss-%{version}
%patch0 -p1 -b .empty-fix
%patch1 -p1 -b .norss-popup
+%patch2 -p1 -b .norss-enabled
+%patch3 -p1 -b .xulrunner
%build
autoreconf -i -f
@@ -90,6 +95,10 @@
%doc TODO
%changelog
+* Thu Mar 29 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-6
+- No feeds enabled patch
+- Patch for xulrunner 1.9 support
+
* Thu Mar 24 2008 Lucian Langa <cooly at gnome.eu.org> - 0.0.8-5
- Fixed wrong function def in previous patch
More information about the fedora-extras-commits
mailing list