From 53bc6ffc531d7a7188e15be245a31f301090ee15 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 10 Sep 2011 11:47:15 -0400
Subject: The EExtension framework is now in libebackend.

The EModule, EExtensible and EExtension classes as well as the
e_type_traverse() function have been moved to Evolution-Data-Server's
libebackend library to replace e-data-server-module.c.

Now Evolution-Data-Server modules use the same framework as Evolution.
---
 shell/e-shell-backend.h        | 3 ++-
 shell/e-shell-content.c        | 5 ++---
 shell/e-shell-searchbar.c      | 2 +-
 shell/e-shell-sidebar.c        | 3 ++-
 shell/e-shell-switcher.c       | 2 +-
 shell/e-shell-taskbar.c        | 4 ++--
 shell/e-shell-view.c           | 2 +-
 shell/e-shell-window-private.h | 2 +-
 shell/e-shell.c                | 6 +++---
 9 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'shell')

diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 3364b16589..ae600bac3d 100644
--- a/shell/e-shell-backend.h
+++ b/shell/e-shell-backend.h
@@ -22,9 +22,10 @@
 #ifndef E_SHELL_BACKEND_H
 #define E_SHELL_BACKEND_H
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell-common.h>
 #include <e-util/e-activity.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SHELL_BACKEND \
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index a109ffb4a7..c7a41510f2 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -32,12 +32,11 @@
 #include "e-shell-content.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-alert-dialog.h"
-#include "e-util/e-alert-sink.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
+#include "e-util/e-alert-sink.h"
 #include "filter/e-rule-editor.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-alert-bar.h"
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index e0c10c656a..13b0b49349 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -32,9 +32,9 @@
 #include "e-shell-searchbar.h"
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-extensible.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-hinted-entry.h"
 
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index abe37b7cbd..62652dee1f 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -31,8 +31,9 @@
 
 #include "e-shell-sidebar.h"
 
+#include <libebackend/e-extensible.h>
+
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-unicode.h>
 #include <shell/e-shell-view.h>
 
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 1bfe01ef25..77c1fd2929 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -32,7 +32,7 @@
 #include "e-shell-switcher.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #define H_PADDING 6
 #define V_PADDING 6
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 1ddbd357e0..adc0d27980 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -31,9 +31,9 @@
 
 #include "e-shell-taskbar.h"
 
-#include <e-shell-view.h>
+#include <libebackend/e-extensible.h>
 
-#include <e-util/e-extensible.h>
+#include <e-shell-view.h>
 #include <misc/e-activity-proxy.h>
 
 struct _EShellTaskbarPrivate {
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 49e05baf36..370aa90403 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -33,8 +33,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-extensible.h"
 #include "e-util/e-file-utils.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-ui-manager.h"
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 6a9744d971..d36a3e64f6 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -28,12 +28,12 @@
 #include <glib/gi18n.h>
 
 #include <gconf/gconf-client.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/gconf-bridge.h>
 #include <widgets/misc/e-alert-bar.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index dbcb55b36a..2954765d15 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -32,12 +32,12 @@
 #include "e-shell.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-module.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserverui/e-passwords.h>
 
-#include "e-util/e-module.h"
-#include "e-util/e-extensible.h"
-#include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
+#include "e-util/e-util-private.h"
 #include "smclient/eggsmclient.h"
 #include "widgets/misc/e-preferences-window.h"
 
-- 
cgit