[evolution-rss] Adapt to evolution 3.3.91 changes
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-rss] Adapt to evolution 3.3.91 changes
- Date: Fri, 16 Mar 2012 13:17:31 +0000 (UTC)
commit 69cb7ddfdc85f7875b22adf0ce311d6ad4821056
Author: Milan Crha <mcrha redhat com>
Date: Fri Mar 16 14:17:08 2012 +0100
Adapt to evolution 3.3.91 changes
configure.ac | 2 +-
src/notification.c | 4 ++++
src/rss-config-factory.c | 4 ++++
src/rss.c | 4 ++++
4 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2c7f5f1..439a2a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then
LIBGTK_VERSION=3
LIBGTK_REQUIRED=2.99.3
EVOLUTION_REQUIRED=2.91.6
- EVOLUTION_ADDITIONAL="libemail-utils libemail-engine"
+ EVOLUTION_ADDITIONAL="libemail-utils libemail-engine libevolution-utils"
fi
PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
diff --git a/src/notification.c b/src/notification.c
index 696cecc..897bbbd 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -23,7 +23,11 @@
#include <mail/em-utils.h>
#if (EVOLUTION_VERSION >= 22900) //kb//
+#if (EVOLUTION_VERSION >= 30391) //kb//
+#include <libevolution-utils/e-alert-dialog.h>
+#else
#include <e-util/e-alert-dialog.h>
+#endif
#include <shell/e-shell-taskbar.h>
#include <shell/e-shell-view.h>
#else
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 555b28a..f2b3fa2 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -44,7 +44,11 @@
#include <e-util/e-error.h>
#include <shell/evolution-config-control.h>
#else
+#if (EVOLUTION_VERSION >= 30391)
+#include <libevolution-utils/e-alert-dialog.h>
+#else
#include <e-util/e-alert-dialog.h>
+#endif
#include <misc/e-preferences-window.h>
#if EVOLUTION_VERSION < 30303
#include <mail/e-mail-local.h>
diff --git a/src/rss.c b/src/rss.c
index 7a6f611..e63e505 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -61,7 +61,11 @@ int rss_verbose_debug = 0;
#include <misc/e-activity-handler.h>
#include <bonobo/bonobo-shlib-factory.h>
#else
+#if (EVOLUTION_VERSION >= 30391) //kb//
+#include <libevolution-utils/e-alert-dialog.h>
+#else
#include <e-util/e-alert-dialog.h> //remove//
+#endif
#include <glib/gi18n.h>
#if EVOLUTION_VERSION < 30303
#include <mail/e-mail-local.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]