[evolution-rss/f14/master] add patch to fix redirect issue
Lucian Langa
lucilanga at fedoraproject.org
Fri Apr 8 18:11:04 UTC 2011
commit 096d70ebc81b63006de838d95bd31115b1fb28f7
Author: Lucian Langa <lucilanga at gnome.org>
Date: Fri Apr 8 21:10:08 2011 +0300
add patch to fix redirect issue
evo-rss-0.2.4-folder-deletion.patch | 91 +++++++++++++++++++++++++++++++++++
evo-rss-0.2.4-redir-crash.patch | 18 +++++++
evolution-rss.spec | 10 ++++-
3 files changed, 118 insertions(+), 1 deletions(-)
---
diff --git a/evo-rss-0.2.4-folder-deletion.patch b/evo-rss-0.2.4-folder-deletion.patch
new file mode 100644
index 0000000..ecf4668
--- /dev/null
+++ b/evo-rss-0.2.4-folder-deletion.patch
@@ -0,0 +1,91 @@
+diff -Naur evolution-rss-0.2.4/src/rss.c evolution-rss-0.2.4-mod/src/rss.c
+--- evolution-rss-0.2.4/src/rss.c 2011-03-06 11:19:57.000000000 +0200
++++ evolution-rss-0.2.4-mod/src/rss.c 2011-04-08 18:54:45.604496054 +0300
+@@ -4189,41 +4189,43 @@
+ if (!real_name)
+ real_name = name;
+
++ if (folder) {
+ #if EVOLUTION_VERSION < 23191
+- camel_exception_init (&ex);
+- rss_delete_folders (store, full_path, &ex);
+- if (camel_exception_is_set (&ex)) {
++ camel_exception_init (&ex);
++ rss_delete_folders (store, full_path, &ex);
++ if (camel_exception_is_set (&ex)) {
+ #else
+- rss_delete_folders (store, full_path, &error);
+- if (error != NULL) {
++ rss_delete_folders (store, full_path, &error);
++ if (error != NULL) {
+ #endif
+ #if EVOLUTION_VERSION < 22904
+- e_error_run(NULL,
+- "mail:no-delete-folder",
+- full_path,
++ e_error_run(NULL,
++ "mail:no-delete-folder",
++ full_path,
+ #if EVOLUTION_VERSION < 23191
+- ex.desc,
++ ex.desc,
+ #else
+- error->message,
++ error->message,
+ #endif
+- NULL);
++ NULL);
+ #else
+- e_alert_run_dialog_for_args(
+- e_shell_get_active_window (NULL),
+- "mail:no-delete-folder",
+- full_path,
++ e_alert_run_dialog_for_args(
++ e_shell_get_active_window (NULL),
++ "mail:no-delete-folder",
++ full_path,
+ #if EVOLUTION_VERSION < 23191
+- ex.desc,
++ ex.desc,
+ #else
+- error->message,
++ error->message,
+ #endif
+- NULL);
++ NULL);
+ #endif
+ #if EVOLUTION_VERSION < 23191
+- camel_exception_clear (&ex);
++ camel_exception_clear (&ex);
+ #else
+- g_clear_error(&error);
++ g_clear_error(&error);
+ #endif
++ }
+ }
+ //also remove status file
+ tkey = g_hash_table_lookup(rf->hrname,
+@@ -4245,10 +4247,7 @@
+ tmp = g_strdup_printf("%s.fav", feed_name);
+ unlink(tmp);
+ g_free(tmp);
+-out: if (folder) {
+- d("print folder:%s\n", real_name);
+- remove_feed_hash(real_name);
+- }
++out: remove_feed_hash(real_name);
+ delete_feed_folder_alloc(name);
+ g_free(name);
+ g_idle_add((GSourceFunc)store_redraw,
+diff -Naur evolution-rss-0.2.4/src/rss-config-factory.c evolution-rss-0.2.4-mod/src/rss-config-factory.c
+--- evolution-rss-0.2.4/src/rss-config-factory.c 2011-03-06 17:11:02.000000000 +0200
++++ evolution-rss-0.2.4-mod/src/rss-config-factory.c 2011-04-08 18:54:45.604496054 +0300
+@@ -1051,7 +1051,7 @@
+ if (!fi || camel_exception_is_set (ex))
+ #else
+ flags, error);
+- if (!fi || error != NULL)
++ if (!fi || *error != NULL)
+ #endif
+ return;
+
diff --git a/evo-rss-0.2.4-redir-crash.patch b/evo-rss-0.2.4-redir-crash.patch
new file mode 100644
index 0000000..9ddc70a
--- /dev/null
+++ b/evo-rss-0.2.4-redir-crash.patch
@@ -0,0 +1,18 @@
+diff -Naur evolution-rss-0.2.4/src/network-soup.c evolution-rss-0.2.4-mod/src/network-soup.c
+--- evolution-rss-0.2.4/src/network-soup.c 2011-03-06 11:19:57.000000000 +0200
++++ evolution-rss-0.2.4-mod/src/network-soup.c 2011-04-08 11:20:19.877495694 +0300
+@@ -681,11 +681,11 @@
+ if (info) {
+ g_signal_connect(G_OBJECT(msg), "got_chunk",
+ G_CALLBACK(got_chunk_cb), info); //FIXME Find a way to free this maybe weak_ref
++ soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
++ soup_message_add_header_handler (msg, "got_body",
++ "Location", G_CALLBACK (redirect_handler), info);
+ }
+
+- soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
+- soup_message_add_header_handler (msg, "got_body",
+- "Location", G_CALLBACK (redirect_handler), soup_sess);
+
+ soup_session_queue_message (soup_sess, msg,
+ cb2, cbdata2);
diff --git a/evolution-rss.spec b/evolution-rss.spec
index 2d1060d..7e3c37e 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -2,13 +2,15 @@ Name: evolution-rss
Summary: Evolution RSS Reader
Epoch: 1
Version: 0.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Internet
License: GPLv2 and GPLv2+
URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
Patch0: evo-rss-0.2.4-export-crash.patch
Patch1: evo-rss-0.2.4-default-export-name.patch
Patch2: evo-rss-0.2.4-opml-default.patch
+Patch3: evo-rss-0.2.4-redir-crash.patch
+Patch4: evo-rss-0.2.4-folder-deletion.patch
Source0: http://gnome.eu.org/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: evolution
@@ -33,6 +35,8 @@ This is an evolution plugin which enables evolution to read rss feeds.
%patch0 -p1 -b .export-crash
%patch1 -p1 -b .default-name
%patch2 -p1 -b .default-filter
+%patch3 -p1 -b .redir-crash
+%patch4 -p1 -b .folder-deletion
%build
%configure --with-primary-render=webkit
@@ -87,6 +91,10 @@ fi
%{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so
%changelog
+* Fri Apr 08 2011 Lucian Langa <cooly at gnome.eu.org> - 1:0.2.4-3
+- upstream patch to fix redir issue - fixes #693186
+- upstream patch to fix folder deletion
+
* Mon Mar 07 2011 Lucian Langa <cooly at gnome.eu.org> - 1:0.2.4-2
- add upstream patch for default export settings
- add upstream patch for crash on export (677374)
More information about the scm-commits
mailing list