[evolution-rss] update build requires, fix compiler defines

[Lucian Langa <lucilanga src gnome org>]

commit ac4222e6d98534d569e400d228cf316a1baef214
Author: Lucian Langa <lucilanga gnome org>
Date:   Sat Sep 19 17:51:51 2009 +0300

    update build requires, fix compiler defines

 configure.ac             |    4 +++-
 src/rss-config-factory.c |    8 ++++----
 src/rss.c                |    7 +++----
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c4023ae..1bdee6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,9 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
    libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
    evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
    evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
-   evolution-data-server-1.2 dnl
+   libebook-1.2 dnl
+   libgnomecanvas-2.0 dnl
+   dnl evolution-data-server-1.2 dnl
    libglade-2.0 dnl
    libgtkhtml-3.14 >= $LIBGTKHTML_REQUIRED
 ])
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index e46a6fb..06ea423 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -35,7 +35,7 @@
 
 #include <mail/em-config.h>
 
-#if EVOLUTION_VERSION < 22800 //kb//
+#if EVOLUTION_VERSION < 22900 //kb//
 #include <shell/evolution-config-control.h>
 #include <bonobo/bonobo-shlib-factory.h>
 #else
@@ -2449,7 +2449,7 @@ out:	return NULL;
  *=============*/
 
 //kb//
-#if EVOLUTION_VERSION < 22800
+#if EVOLUTION_VERSION < 22900
 EvolutionConfigControl *
 #else
 GtkWidget *
@@ -2687,14 +2687,14 @@ rss_config_control_new (void)
 
         gtk_container_remove (GTK_CONTAINER (control_widget->parent), control_widget);
 
-#if EVOLUTION_VERSION < 22800 //kb//
+#if EVOLUTION_VERSION < 22900 //kb//
         return evolution_config_control_new (control_widget);
 #else
 	return control_widget;
 #endif
 }
 
-#if EVOLUTION_VERSION < 22800
+#if EVOLUTION_VERSION < 22900
 static BonoboObject *
 factory (BonoboGenericFactory *factory,
          const char *component_id,
diff --git a/src/rss.c b/src/rss.c
index 7716546..2e2ae29 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -32,7 +32,6 @@ int rss_verbose_debug = 0;
 
 #include <camel/camel-mime-message.h>
 #include <camel/camel-folder.h>
-//#include <camel/camel-exception.h>
 #include <camel/camel-multipart.h>
 #include <camel/camel-stream-mem.h>
 #include <camel/camel-stream-fs.h>
@@ -48,23 +47,24 @@ int rss_verbose_debug = 0;
 #include <mail/em-event.h>
 #endif
 
-
 #include <mail/em-utils.h>
 #include <mail/em-folder-tree.h>
 
-
 #if EVOLUTION_VERSION < 22900 //kb//
 #include <mail/em-popup.h>
 #include <mail/em-folder-view.h>
 #include <mail/em-format.h>
 #include <mail/mail-component.h>
 #include <misc/e-activity-handler.h>
+#include <bonobo/bonobo-shlib-factory.h>
 #else
+#include <glib/gi18n.h>
 #include <mail/e-mail-local.h>
 #include <shell/e-shell.h>
 #include <shell/e-shell-taskbar.h>
 #include <shell/e-shell-view.h>
 #include <misc/e-popup-menu.h>
+#include <misc/e-gui-utils.h>
 #endif
 
 #include <mail/mail-tools.h>
@@ -90,7 +90,6 @@ int rss_verbose_debug = 0;
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <bonobo/bonobo-shlib-factory.h>
 
 #include <shell/es-event.h>
 #include <camel/camel-data-cache.h>