[evolution-rss] fix taskbar messages

[Lucian Langa <lucilanga src gnome org>]

commit 565ba2434ca6ecce14ee14392c41240e1fd5d1ec
Author: Lucian Langa <lucilanga gnome org>
Date:   Tue Sep 1 07:47:33 2009 +0300

    fix taskbar messages

 src/org-gnome-evolution-rss.eplug.xml |   11 +++++++++++
 src/rss.c                             |   12 +++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/src/org-gnome-evolution-rss.eplug.xml b/src/org-gnome-evolution-rss.eplug.xml
index 65ef02c..98b6db9 100644
--- a/src/org-gnome-evolution-rss.eplug.xml
+++ b/src/org-gnome-evolution-rss.eplug.xml
@@ -81,6 +81,17 @@ HTML can be displayed using the following engines: gtkHTML, Apple's Webkit or Fi
                 </group>
         </hook>
 
+<hook class="org.gnome.evolution.ui:1.0">
+      <ui-manager id="org.gnome.evolution.mail">
+<!--              <popup name="mail-folder-popup">
+                 <placeholder name="mail-folder-popup-actions">
+                         <menuitem action="mail-mark-read-recursive"/>
+                 </placeholder>
+              </popup>-->
+       </ui-manager>
+</hook>
+
+
 <hook class="org.gnome.evolution.mail.events:1.0">
     <event id="mail.sendreceive" 
 	enable="sendreceive"
diff --git a/src/rss.c b/src/rss.c
index 3653a62..476facf 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -287,6 +287,7 @@ gboolean show_webkit(GtkWidget *webkit);
 void sync_folders(void);
 
 GtkTreeStore *evolution_store = NULL;
+EShellView *rss_shell_view = NULL;
 
 /*======================================================================*/
 
@@ -406,12 +407,8 @@ taskbar_push_message(gchar *message)
 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
 	e_activity_handler_set_message(activity_handler, message);
 #else
-	EShell *shell;
 	EShellTaskbar *shell_taskbar;
-
-	shell = e_shell_get_default ();
-	shell_taskbar = e_shell_view_get_shell_taskbar (shell);
-
+	shell_taskbar = e_shell_view_get_shell_taskbar (rss_shell_view);
 	e_shell_taskbar_set_message (shell_taskbar, message);
 #endif
 }
@@ -422,6 +419,10 @@ taskbar_pop_message(void)
 #if EVOLUTION_VERSION < 22800 //kb//
 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
 	e_activity_handler_unset_message(activity_handler);
+#else
+	EShellTaskbar *shell_taskbar;
+	shell_taskbar = e_shell_view_get_shell_taskbar (rss_shell_view);
+	e_shell_taskbar_set_message (shell_taskbar, "");
 #endif
 }
 
@@ -4609,6 +4610,7 @@ e_plugin_ui_init (GtkUIManager *ui_manager,
                   EShellView *shell_view)
 {
 	g_print("ui init\n");
+	rss_shell_view = shell_view;
 }
 
 #if (EVOLUTION_VERSION < 22800)