GNOME.org
 

[evolution-mapi] Adapt to Evolution library consolidation.

commit 64ce69dc1049a453b9afb28a68d2ef0311f1bce8
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Dec 11 22:03:16 2012 -0500

    Adapt to Evolution library consolidation.

 configure.ac                                       |    1 -
 src/configuration/e-book-config-mapi.c             |    2 --
 src/configuration/e-book-config-mapi.h             |    2 +-
 src/configuration/e-book-config-mapigal.c          |    2 --
 src/configuration/e-book-config-mapigal.h          |    2 +-
 src/configuration/e-cal-config-mapi.c              |    2 --
 src/configuration/e-cal-config-mapi.h              |    2 +-
 src/configuration/e-mail-config-mapi-backend.c     |    1 -
 src/configuration/e-mapi-config-utils.c            |    6 +-----
 src/configuration/e-mapi-config-utils.h            |    2 --
 .../e-mapi-subscribe-foreign-folder.c              |    1 -
 11 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e4d0dc7..9290007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,7 +146,6 @@ dnl ********************************
 dnl Check for evolution-data-server 
 dnl ********************************
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER, evolution-data-server-$EDS_PACKAGE >= eds_minimum_version)
-PKG_CHECK_MODULES(LIBEDATASERVERUI, libedataserverui-3.0 >= eds_minimum_version)
 PKG_CHECK_MODULES(LIBEDATASERVER, libedataserver-$EDS_PACKAGE >= eds_minimum_version)
 PKG_CHECK_MODULES(LIBEBACKEND, libebackend-$EDS_PACKAGE >= eds_minimum_version)
 PKG_CHECK_MODULES(LIBECAL, libecal-$EDS_PACKAGE >= eds_minimum_version)
diff --git a/src/configuration/e-book-config-mapi.c b/src/configuration/e-book-config-mapi.c
index 0ac35f1..13effc3 100644
--- a/src/configuration/e-book-config-mapi.c
+++ b/src/configuration/e-book-config-mapi.c
@@ -20,8 +20,6 @@
 #include <config.h>
 #endif
 
-#include <misc/e-book-source-config.h>
-
 #include "e-book-config-mapi.h"
 #include "e-mapi-config-utils.h"
 
diff --git a/src/configuration/e-book-config-mapi.h b/src/configuration/e-book-config-mapi.h
index 1274551..a5ff6ab 100644
--- a/src/configuration/e-book-config-mapi.h
+++ b/src/configuration/e-book-config-mapi.h
@@ -19,7 +19,7 @@
 #ifndef E_BOOK_CONFIG_MAPI_H
 #define E_BOOK_CONFIG_MAPI_H
 
-#include <misc/e-source-config-backend.h>
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define E_TYPE_BOOK_CONFIG_MAPI \
diff --git a/src/configuration/e-book-config-mapigal.c b/src/configuration/e-book-config-mapigal.c
index fe7945c..5df9879 100644
--- a/src/configuration/e-book-config-mapigal.c
+++ b/src/configuration/e-book-config-mapigal.c
@@ -22,8 +22,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <misc/e-book-source-config.h>
-
 #include "e-source-mapi-folder.h"
 #include "e-book-config-mapigal.h"
 
diff --git a/src/configuration/e-book-config-mapigal.h b/src/configuration/e-book-config-mapigal.h
index d1bad9c..007c58d 100644
--- a/src/configuration/e-book-config-mapigal.h
+++ b/src/configuration/e-book-config-mapigal.h
@@ -19,7 +19,7 @@
 #ifndef E_BOOK_CONFIG_MAPIGAL_H
 #define E_BOOK_CONFIG_MAPIGAL_H
 
-#include <misc/e-source-config-backend.h>
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define E_TYPE_BOOK_CONFIG_MAPIGAL \
diff --git a/src/configuration/e-cal-config-mapi.c b/src/configuration/e-cal-config-mapi.c
index f93cc81..fbb0ae5 100644
--- a/src/configuration/e-cal-config-mapi.c
+++ b/src/configuration/e-cal-config-mapi.c
@@ -20,8 +20,6 @@
 #include <config.h>
 #endif
 
-#include <misc/e-cal-source-config.h>
-
 #include "e-cal-config-mapi.h"
 #include "e-mapi-config-utils.h"
 
diff --git a/src/configuration/e-cal-config-mapi.h b/src/configuration/e-cal-config-mapi.h
index af0ee5b..13b5279 100644
--- a/src/configuration/e-cal-config-mapi.h
+++ b/src/configuration/e-cal-config-mapi.h
@@ -19,7 +19,7 @@
 #ifndef E_CAL_CONFIG_MAPI_H
 #define E_CAL_CONFIG_MAPI_H
 
-#include <misc/e-source-config-backend.h>
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CAL_CONFIG_MAPI \
diff --git a/src/configuration/e-mail-config-mapi-backend.c b/src/configuration/e-mail-config-mapi-backend.c
index 5d6839a..8370bd8 100644
--- a/src/configuration/e-mail-config-mapi-backend.c
+++ b/src/configuration/e-mail-config-mapi-backend.c
@@ -26,7 +26,6 @@
 #include <libebackend/libebackend.h>
 #include <libedataserver/libedataserver.h>
 
-#include <e-util/e-dialog-utils.h>
 #include <mail/e-mail-config-auth-check.h>
 #include <mail/e-mail-config-receiving-page.h>
 #include <shell/e-shell.h>
diff --git a/src/configuration/e-mapi-config-utils.c b/src/configuration/e-mapi-config-utils.c
index 22a5b4b..fba01c4 100644
--- a/src/configuration/e-mapi-config-utils.c
+++ b/src/configuration/e-mapi-config-utils.c
@@ -26,12 +26,8 @@
 
 #include <gtk/gtk.h>
 #include <libedataserver/libedataserver.h>
-#include <libedataserverui/libedataserverui.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util.h>
+
 #include <mail/em-folder-tree.h>
-#include <misc/e-book-source-config.h>
-#include <misc/e-cal-source-config.h>
 #include <shell/e-shell.h>
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
diff --git a/src/configuration/e-mapi-config-utils.h b/src/configuration/e-mapi-config-utils.h
index de479ba..db78825 100644
--- a/src/configuration/e-mapi-config-utils.h
+++ b/src/configuration/e-mapi-config-utils.h
@@ -22,8 +22,6 @@
 #include <gtk/gtk.h>
 
 #include <shell/e-shell-view.h>
-#include <misc/e-source-config.h>
-#include <misc/e-source-config-backend.h>
 
 #include "e-mapi-connection.h"
 #include "camel-mapi-settings.h"
diff --git a/src/configuration/e-mapi-subscribe-foreign-folder.c b/src/configuration/e-mapi-subscribe-foreign-folder.c
index 7fc0002..59bc3ff 100644
--- a/src/configuration/e-mapi-subscribe-foreign-folder.c
+++ b/src/configuration/e-mapi-subscribe-foreign-folder.c
@@ -28,7 +28,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <libedataserverui/libedataserverui.h>
 #include <libemail-engine/e-mail-session.h>
 
 #include "camel/camel-mapi-store.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]