[evolution-rss] adapt to ESEvent changes

[Lucian Langa <lucilanga src gnome org>]

commit 846f00a9d80a0119c6d5358b43ea6576d73bfec1
Author: Lucian Langa <lucilanga gnome org>
Date:   Thu Aug 29 15:24:13 2013 +0200

    adapt to ESEvent changes

 src/rss.c |   16 +++++++++++++++-
 src/rss.h |    2 ++
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/src/rss.c b/src/rss.c
index ef2e6a5..4c9b06b 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -108,7 +108,9 @@ int rss_verbose_debug = 0;
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#if (EVOLUTION_VERSION < 30905)
 #include <shell/es-event.h>
+#endif
 
 #ifdef HAVE_GTKHTMLEDITOR
 #include <editor/gtkhtml-editor.h>
@@ -3309,7 +3311,7 @@ struct _EShell {
 };
 typedef struct _EShell EShell;
 #endif
-
+#if (EVOLUTION_VERSION < 30905)
 #if EVOLUTION_VERSION < 22900 //KB
 void org_gnome_cooly_rss_startup(void *ep, EMPopupTargetSelect *t);
 
@@ -3319,6 +3321,11 @@ void org_gnome_cooly_rss_startup(void *ep, ESEventTargetUpgrade *t);
 
 void org_gnome_cooly_rss_startup(void *ep, ESEventTargetUpgrade *t)
 #endif
+#else
+void org_gnome_cooly_rss_startup(void *ep, void *t);
+
+void org_gnome_cooly_rss_startup(void *ep, void *t)
+#endif
 {
        gdouble timeout;
 #if EVOLUTION_VERSION < 30304
@@ -3737,6 +3744,10 @@ e_plugin_lib_enable(EPlugin *ep, int enable)
 {
        char *d;
        guint render;
+#if (EVOLUTION_VERSION >= 30905)
+       EShell *shell;
+       GApplication *app;
+#endif
 
        if (enable) {
                bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
@@ -3817,6 +3828,9 @@ e_plugin_lib_enable(EPlugin *ep, int enable)
 #endif
                }
                upgrade = 2; //init done
+#if (EVOLUTION_VERSION >= 30905)
+               org_gnome_cooly_rss_startup(NULL, NULL);
+#endif
        } else {
                abort_all_soup();
                printf("Plugin disabled\n");
diff --git a/src/rss.h b/src/rss.h
index f542a99..ae59d68 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -32,7 +32,9 @@
 #include <libsoup/soup.h>
 #include <shell/e-shell.h>
 #include <shell/e-shell-view.h>
+#if (EVOLUTION_VERSION < 30905)
 #include <shell/es-event.h>
+#endif
 
 #if (DATASERVER_VERSION >= 2031001)
 #include <camel/camel.h>