[evolution-rss] Replace dropped e_shell_get_watched_windows() function

[Milan Crha]

commit 290bcc39b7c2cf27c7b58e082fb600a2dd872488
Author: Milan Crha <mcrha at redhat.com>
Date:   Fri Nov 4 07:53:34 2011 +0100

    Replace dropped e_shell_get_watched_windows() function

 evolution-rss-0.2.90-get-watched-windows.patch |   31 ++++++++++++++++++++++++
 evolution-rss.spec                             |    5 ++++
 2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/evolution-rss-0.2.90-get-watched-windows.patch b/evolution-rss-0.2.90-get-watched-windows.patch
new file mode 100644
index 0000000..4276bc8
--- /dev/null
+++ b/evolution-rss-0.2.90-get-watched-windows.patch
@@ -0,0 +1,31 @@
+diff -up evolution-rss-0.2.90/src/notification.c.get-watched-windows evolution-rss-0.2.90/src/notification.c
+--- evolution-rss-0.2.90/src/notification.c.get-watched-windows	2011-11-04 07:49:31.322056192 +0100
++++ evolution-rss-0.2.90/src/notification.c	2011-11-04 07:50:12.547521528 +0100
+@@ -69,7 +69,6 @@ rss_error(gpointer key, gchar *name, gch
+ 	EShell *shell;
+ 	EMailBackend *backend;
+ 	GtkWindow *parent;
+-	GList *windows;
+ #else
+ 	EActivityHandler *activity_handler;
+ 	guint id;
+@@ -90,8 +89,7 @@ rss_error(gpointer key, gchar *name, gch
+ 			e_shell_submit_alert (shell, alert);
+ 			goto out;
+ #endif
+-			windows = e_shell_get_watched_windows (shell);
+-			parent = (windows != NULL) ? GTK_WINDOW (windows->data) : NULL;
++			parent = e_shell_get_active_window (shell);
+ 
+ 
+ #if (EVOLUTION_VERSION >= 29102)
+@@ -155,8 +153,7 @@ rss_error(gpointer key, gchar *name, gch
+ 	if (!rf->errdialog) {
+ #if (EVOLUTION_VERSION >= 22900) //kb//
+ 		shell = e_shell_get_default ();
+-		windows = e_shell_get_watched_windows (shell);
+-		parent = (windows != NULL) ? GTK_WINDOW (windows->data) : NULL;
++		parent = e_shell_get_active_window (shell);
+ 
+ 		ed  = e_alert_dialog_new_for_args(parent,
+ 			"org-gnome-evolution-rss:feederr",
diff --git a/evolution-rss.spec b/evolution-rss.spec
index 1eb85af..2fb18e3 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -15,6 +15,7 @@ Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		%{tarfile}
+Patch0:         evolution-rss-0.2.90-get-watched-windows.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -36,6 +37,7 @@ This is an evolution plugin which enables evolution to read rss feeds.
 
 %prep
 %setup -q -n evolution-rss-%{version}
+%patch0 -p1 -b .get-watched-windows
 
 %build
 ./autogen.sh
@@ -92,6 +94,9 @@ fi
 %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so
 
 %changelog
+* Fri Nov 04 2011 Milan Crha <mcrha at redhat.com> - 0.2.90-30.20110818git
+- Replace dropped e_shell_get_watched_windows() function
+
 * Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 0.2.90-30.20110818git
 - Rebuild against newer evolution-data-server