[evolution] The EExtension framework is now in libebackend.

From: Matthew Barnes <mbarnes src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] The EExtension framework is now in libebackend.
Date: Mon, 26 Sep 2011 13:46:16 +0000 (UTC)
commit 53bc6ffc531d7a7188e15be245a31f301090ee15
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Sep 10 11:47:15 2011 -0400

    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.

 calendar/gui/dialogs/comp-editor.c                 |    2 +-
 calendar/gui/e-cal-model.c                         |    2 +-
 calendar/gui/e-calendar-view.c                     |    2 +-
 calendar/gui/e-meeting-store.c                     |    2 +-
 calendar/gui/e-meeting-time-sel.c                  |    6 +-
 composer/e-composer-private.h                      |    3 +-
 configure.ac                                       |    2 +-
 doc/reference/shell/eshell-docs.sgml               |    7 -
 doc/reference/shell/eshell-sections.txt            |   56 ----
 doc/reference/shell/eshell.types                   |    3 -
 doc/reference/shell/tmpl/e-extensible.sgml         |   46 ---
 doc/reference/shell/tmpl/e-extension.sgml          |   42 ---
 doc/reference/shell/tmpl/e-module.sgml             |   60 ----
 doc/reference/shell/tmpl/e-util.sgml               |   10 -
 doc/reference/shell/tmpl/eshell-unused.sgml        |  171 +++++++++++
 e-util/Makefile.am                                 |    6 -
 e-util/e-extensible.c                              |  186 ------------
 e-util/e-extensible.h                              |   59 ----
 e-util/e-extension.c                               |  186 ------------
 e-util/e-extension.h                               |   72 -----
 e-util/e-module.c                                  |  320 --------------------
 e-util/e-module.h                                  |   75 -----
 e-util/e-plugin.c                                  |    2 +-
 e-util/e-util.c                                    |   41 ---
 e-util/e-util.h                                    |    3 -
 mail/e-mail-junk-filter.h                          |    2 +-
 mail/e-mail-session.c                              |    4 +-
 mail/em-format-html.c                              |    5 +-
 modules/calendar/e-cal-config-calendar-item.c      |    3 +-
 modules/calendar/e-cal-config-comp-editor.c        |    3 +-
 modules/calendar/e-cal-config-date-edit.c          |    3 +-
 modules/calendar/e-cal-config-meeting-store.c      |    3 +-
 .../calendar/e-cal-config-meeting-time-selector.c  |    3 +-
 modules/calendar/e-cal-config-model.c              |    3 +-
 modules/calendar/e-cal-config-view.c               |    3 +-
 modules/composer-autosave/e-composer-autosave.c    |    3 +-
 modules/composer-autosave/e-composer-registry.c    |    3 +-
 modules/connman/evolution-connman.c                |    2 +-
 modules/mail/e-mail-config-format-html.c           |    3 +-
 modules/mail/e-mail-config-reader.c                |    3 +-
 modules/mail/e-mail-config-web-view.c              |    3 +-
 modules/mailto-handler/evolution-mailto-handler.c  |    2 +-
 .../network-manager/evolution-network-manager.c    |    2 +-
 modules/offline-alert/evolution-offline-alert.c    |    3 +-
 modules/plugin-manager/evolution-plugin-manager.c  |    5 +-
 modules/startup-wizard/evolution-startup-wizard.c  |    2 +-
 modules/windows-sens/evolution-windows-sens.c      |    3 +-
 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 +-
 widgets/misc/e-attachment-handler.h                |    2 +-
 widgets/misc/e-attachment-icon-view.c              |    2 +-
 widgets/misc/e-attachment-tree-view.c              |    2 +-
 widgets/misc/e-calendar-item.c                     |    3 +-
 widgets/misc/e-dateedit.c                          |    2 +-
 widgets/misc/e-import-assistant.c                  |    2 +-
 widgets/misc/e-web-view.c                          |    2 +-
 63 files changed, 245 insertions(+), 1229 deletions(-)
---
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index d5190ba..42b8ace 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -35,10 +35,10 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <e-util/e-util.h>
 #include <e-util/e-alert-sink.h>
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-util-private.h>
 #include <e-util/gconf-bridge.h>
 #include <shell/e-shell.h>
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 1ab5692..637d0f5 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -28,6 +28,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-flag.h>
 #include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-client-view.h>
@@ -38,7 +39,6 @@
 #include "misc.h"
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util-enumtypes.h"
 
 typedef struct {
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 82bbea2..b70df8b 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -30,11 +30,11 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserverui/e-client-utils.h>
 #include <e-util/e-util.h>
 #include <e-util/e-alert-dialog.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-selection.h>
 #include <e-util/e-datetime-format.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 51ce798..7e5fbf2 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -31,10 +31,10 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-proxy.h>
 #include <libedataserverui/e-passwords.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-util-enumtypes.h>
 #include "itip-utils.h"
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 9afdfd7..36e7ad7 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -31,15 +31,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
-
 #include "misc/e-dateedit.h"
-#include "e-util/e-extensible.h"
+
 #include "e-util/e-util.h"
 
 #include "e-meeting-utils.h"
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 2298977..35eb266 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -33,12 +33,13 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include <libebackend/e-extensible.h>
+
 #include "e-composer-actions.h"
 #include "e-composer-activity.h"
 #include "e-composer-header-table.h"
 #include "e-util/e-alert-sink.h"
 #include "e-util/e-charset.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-marshal.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-plugin-ui.h"
diff --git a/configure.ac b/configure.ac
index ac19503..0368b16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1232,7 +1232,7 @@ AC_SUBST(CERT_UI_LIBS)
 dnl ************
 dnl E_UTIL Flags
 dnl ************
-EVO_SET_COMPILE_FLAGS(E_UTIL, libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS)
+EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS)
 AC_SUBST(E_UTIL_CFLAGS)
 AC_SUBST(E_UTIL_LIBS)
 
diff --git a/doc/reference/shell/eshell-docs.sgml b/doc/reference/shell/eshell-docs.sgml
index 5451736..666da02 100644
--- a/doc/reference/shell/eshell-docs.sgml
+++ b/doc/reference/shell/eshell-docs.sgml
@@ -47,13 +47,6 @@
   </chapter>
 
   <chapter>
-    <title>Extending Evolution</title>
-    <xi:include href="xml/e-module.xml"/>
-    <xi:include href="xml/e-extension.xml"/>
-    <xi:include href="xml/e-extensible.xml"/>
-  </chapter>
-
-  <chapter>
     <title>Actions</title>
     <xi:include href="xml/shell-actions.xml"/>
     <xi:include href="xml/action-groups.xml"/>
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 6e23f58..1313419 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -854,41 +854,6 @@ e_dialog_combo_box_get
 </SECTION>
 
 <SECTION>
-<FILE>e-extensible</FILE>
-<TITLE>EExtensible</TITLE>
-EExtensible
-e_extensible_load_extensions
-e_extensible_list_extensions
-<SUBSECTION Standard>
-E_EXTENSIBLE
-E_IS_EXTENSIBLE
-E_TYPE_EXTENSIBLE
-E_EXTENSIBLE_INTERFACE
-E_IS_EXTENSIBLE_INTERFACE
-E_EXTENSIBLE_GET_INTERFACE
-EExtensibleInterface
-e_extensible_get_type
-</SECTION>
-
-<SECTION>
-<FILE>e-extension</FILE>
-<TITLE>EExtension</TITLE>
-EExtension
-e_extension_get_extensible
-<SUBSECTION Standard>
-E_EXTENSION
-E_IS_EXTENSION
-E_TYPE_EXTENSION
-E_EXTENSION_CLASS
-E_IS_EXTENSION_CLASS
-E_EXTENSION_GET_CLASS
-EExtensionClass
-e_extension_get_type
-<SUBSECTION Private>
-EExtensionPrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-html-utils</FILE>
 <TITLE>Text to HTML Conversion</TITLE>
 E_TEXT_TO_HTML_PRE
@@ -913,26 +878,6 @@ e_icon_factory_create_thumbnail
 </SECTION>
 
 <SECTION>
-<FILE>e-module</FILE>
-<TITLE>EModule</TITLE>
-EModule
-e_module_new
-e_module_get_filename
-e_module_load_all_in_directory
-<SUBSECTION Standard>
-E_MODULE
-E_IS_MODULE
-E_TYPE_MODULE
-E_MODULE_CLASS
-E_IS_MODULE_CLASS
-E_MODULE_GET_CLASS
-EModuleClass
-e_module_get_type
-<SUBSECTION Private>
-EModulePrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-poolv</FILE>
 <TITLE>EPoolv</TITLE>
 EPoolv
@@ -1137,7 +1082,6 @@ e_action_compare_by_label
 e_action_group_remove_all_actions
 e_radio_action_get_current_action
 e_categories_add_change_hook
-e_type_traverse
 e_str_without_underscores
 e_str_compare
 e_str_case_compare
diff --git a/doc/reference/shell/eshell.types b/doc/reference/shell/eshell.types
index 51b7c76..4e01f34 100644
--- a/doc/reference/shell/eshell.types
+++ b/doc/reference/shell/eshell.types
@@ -1,7 +1,4 @@
 e_bit_array_get_type
-e_extensible_get_type
-e_extension_get_type
-e_module_get_type
 e_signature_get_type
 e_signature_list_get_type
 e_shell_get_type
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index 2cddc59..7adb70c 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -103,16 +103,6 @@ Miscellaneous Utilities
 @object: 
 
 
-<!-- ##### FUNCTION e_type_traverse ##### -->
-<para>
-
-</para>
-
- parent_type: 
- func: 
- user_data: 
-
-
 <!-- ##### FUNCTION e_str_without_underscores ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index bc13bf3..21f8c4a 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -26,6 +26,62 @@
 GObject Property Bindings
 
 
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Title ##### -->
+EExtensible
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Title ##### -->
+EExtension
+
+
 <!-- ##### SECTION ./tmpl/e-logger.sgml:Image ##### -->
 
 
@@ -54,6 +110,34 @@ GObject Property Bindings
 Error Logging
 
 
+<!-- ##### SECTION ./tmpl/e-module.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Title ##### -->
+EModule
+
+
 <!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Image ##### -->
 
 
@@ -154,6 +238,24 @@ e-shell-window.sgml
 @user_data: 
 @Returns: 
 
+<!-- ##### STRUCT EExtensible ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT EExtension ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EExtension:extensible ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### USER_FUNCTION ELogFunction ##### -->
 <para>
 
@@ -183,6 +285,18 @@ e-shell-window.sgml
 </para>
 
 
+<!-- ##### STRUCT EModule ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EModule:filename ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT EMutualBinding ##### -->
 <para>
 
@@ -437,6 +551,30 @@ e-shell-window.sgml
 
 @binding: 
 
+<!-- ##### FUNCTION e_extensible_list_extensions ##### -->
+<para>
+
+</para>
+
+ extensible: 
+ extension_type: 
+ Returns: 
+
+<!-- ##### FUNCTION e_extensible_load_extensions ##### -->
+<para>
+
+</para>
+
+ extensible: 
+
+<!-- ##### FUNCTION e_extension_get_extensible ##### -->
+<para>
+
+</para>
+
+ extension: 
+ Returns: 
+
 <!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
 <para>
 
@@ -488,6 +626,30 @@ e-shell-window.sgml
 @name: 
 @Returns: 
 
+<!-- ##### FUNCTION e_module_get_filename ##### -->
+<para>
+
+</para>
+
+ module: 
+ Returns: 
+
+<!-- ##### FUNCTION e_module_load_all_in_directory ##### -->
+<para>
+
+</para>
+
+ dirname: 
+ Returns: 
+
+<!-- ##### FUNCTION e_module_new ##### -->
+<para>
+
+</para>
+
+ filename: 
+ Returns: 
+
 <!-- ##### FUNCTION e_mutual_binding_new ##### -->
 <para>
 
@@ -582,6 +744,15 @@ e-shell-window.sgml
 @key: 
 @Returns: 
 
+<!-- ##### FUNCTION e_type_traverse ##### -->
+<para>
+
+</para>
+
+ parent_type: 
+ func: 
+ user_data: 
+
 <!-- ##### FUNCTION get_font_options ##### -->
 <para>
 
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 53614e3..42fda2d 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -31,15 +31,12 @@ eutilinclude_HEADERS = 				\
 	e-dialog-utils.h			\
 	e-dialog-widgets.h			\
 	e-event.h				\
-	e-extensible.h				\
-	e-extension.h				\
 	e-file-utils.h				\
 	e-html-utils.h				\
 	e-icon-factory.h			\
 	e-import.h				\
 	e-marshal.h				\
 	e-mktemp.h				\
-	e-module.h				\
 	e-poolv.h				\
 	e-print.h				\
 	e-plugin.h				\
@@ -106,15 +103,12 @@ libeutil_la_SOURCES =				\
 	e-dialog-utils.c			\
 	e-dialog-widgets.c			\
 	e-event.c				\
-	e-extensible.c				\
-	e-extension.c				\
 	e-file-utils.c				\
 	e-html-utils.c				\
 	e-icon-factory.c			\
 	e-import.c				\
 	e-marshal.c				\
 	e-mktemp.c				\
-	e-module.c				\
 	e-poolv.c				\
 	e-plugin.c				\
 	e-plugin-ui.c				\
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 17650f0..a19dc87 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -27,12 +27,12 @@
 
 #include <gconf/gconf-client.h>
 
+#include <libebackend/e-module.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-xml-utils.h>
 
 #include "e-plugin.h"
 #include "e-util-private.h"
-#include "e-util.h"
 
 /* plugin debug */
 #define pd(x)
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 8ededee..cd48984 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -489,47 +489,6 @@ e_categories_add_change_hook (GHookFunc func,
 }
 
 /**
- * e_type_traverse:
- * @parent_type: the root #GType to traverse from
- * @func: the function to call for each visited #GType
- * @user_data: user data to pass to the function
- *
- * Calls @func for all instantiable subtypes of @parent_type.
- *
- * This is often useful for extending functionality by way of #EModule.
- * A module may register a subtype of @parent_type in its e_module_load()
- * function.  Then later on the application will call e_type_traverse()
- * to instantiate all registered subtypes of @parent_type.
- **/
-void
-e_type_traverse (GType parent_type,
-                 ETypeFunc func,
-                 gpointer user_data)
-{
-	GType *children;
-	guint n_children, ii;
-
-	g_return_if_fail (func != NULL);
-
-	children = g_type_children (parent_type, &n_children);
-
-	for (ii = 0; ii < n_children; ii++) {
-		GType type = children[ii];
-
-		/* Recurse over the child's children. */
-		e_type_traverse (type, func, user_data);
-
-		/* Skip abstract types. */
-		if (G_TYPE_IS_ABSTRACT (type))
-			continue;
-
-		func (type, user_data);
-	}
-
-	g_free (children);
-}
-
-/**
  * e_str_without_underscores:
  * @string: the string to strip underscores from
  *
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 8463fd4..cb88a90 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -69,9 +69,6 @@ GtkRadioAction *e_radio_action_get_current_action
 						(GtkRadioAction *radio_action);
 void		e_categories_add_change_hook	(GHookFunc func,
 						 gpointer object);
-void		e_type_traverse			(GType parent_type,
-						 ETypeFunc func,
-						 gpointer user_data);
 
 gchar *		e_str_without_underscores	(const gchar *string);
 gint		e_str_compare			(gconstpointer x,
diff --git a/mail/e-mail-junk-filter.h b/mail/e-mail-junk-filter.h
index 34d95e5..74a7840 100644
--- a/mail/e-mail-junk-filter.h
+++ b/mail/e-mail-junk-filter.h
@@ -20,7 +20,7 @@
 #define E_MAIL_JUNK_FILTER_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_JUNK_FILTER \
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index e182050..333ee74 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -44,13 +44,13 @@
 #include <canberra-gtk.h>
 #endif
 
-#include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-flag.h>
+#include <libebackend/e-extensible.h>
+#include <libedataserverui/e-passwords.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util-private.h"
 #include "e-util/gconf-bridge.h"
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index e41455e..f3209b8 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -40,13 +40,14 @@
 #undef interface
 #endif
 
-#include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
+#include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
+
 #include "e-util/e-datetime-format.h"
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
-#include "e-util/e-extensible.h"
 #include "misc/e-web-view.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
index 09895c0..d0d6e11 100644
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ b/modules/calendar/e-cal-config-calendar-item.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-calendar-item.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-calendar-item.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
index b522975..dc37c74 100644
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ b/modules/calendar/e-cal-config-comp-editor.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-comp-editor.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/dialogs/comp-editor.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
index d595497..48a5848 100644
--- a/modules/calendar/e-cal-config-date-edit.c
+++ b/modules/calendar/e-cal-config-date-edit.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-date-edit.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-dateedit.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
index f9a91da..7b4f2de 100644
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ b/modules/calendar/e-cal-config-meeting-store.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-store.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-store.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
index 23eef11..249d541 100644
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ b/modules/calendar/e-cal-config-meeting-time-selector.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-time-selector.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-time-sel.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index f42e4a9..9898942 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-model.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-cal-model.h>
 #include <calendar/gui/e-cal-model-tasks.h>
 
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index ecc3587..afe747d 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-view.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-day-view.h>
 #include <calendar/gui/e-week-view.h>
 
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index f257887..f2b39c4 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -20,7 +20,8 @@
 #include <config.h>
 #endif
 
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
+
 #include <e-util/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index eef69f1..9fcba43 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -21,9 +21,10 @@
 #endif
 
 #include <glib/gstdio.h>
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
-#include <e-util/e-extension.h>
 #include <e-util/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index f6225df..2c35c24 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -21,9 +21,9 @@
 #endif
 
 #include <gio/gio.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 #define CM_DBUS_SERVICE   "net.connman"
 #define CM_DBUS_INTERFACE "net.connman.Manager"
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index 23d448f..83bc78f 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -22,9 +22,10 @@
 
 #include "e-mail-config-format-html.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extension.h>
 #include <mail/em-format-html.h>
 
 static gpointer parent_class;
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
index 3837581..b284fbd 100644
--- a/modules/mail/e-mail-config-reader.c
+++ b/modules/mail/e-mail-config-reader.c
@@ -22,8 +22,9 @@
 
 #include "e-mail-config-reader.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <mail/e-mail-reader.h>
 
 static gpointer parent_class;
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index b8a755b..ebab286 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -22,8 +22,9 @@
 
 #include "e-mail-config-web-view.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-web-view.h>
 
 typedef struct _EMailConfigWebView EMailConfigWebView;
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index fdc3841..4846aaa 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -21,9 +21,9 @@
 #endif
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAILTO_HANDLER \
diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c
index 3168b9a..bb83ba8 100644
--- a/modules/network-manager/evolution-network-manager.c
+++ b/modules/network-manager/evolution-network-manager.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <gio/gio.h>
+#include <libebackend/e-extension.h>
 #include <NetworkManager/NetworkManager.h>
 
 #if !defined(NM_CHECK_VERSION)
@@ -28,7 +29,6 @@
 #endif
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_NETWORK_MANAGER \
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index 4c064ce..9fb5d2a 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -20,10 +20,11 @@
 #include <config.h>
 #endif
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window-actions.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_OFFLINE_ALERT \
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index 29dba6c..f95af37 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -20,13 +20,12 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n-lib.h>
-
 #include <string.h>
 #include <stdio.h>
+#include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <e-util/e-plugin.h>
-#include <e-util/e-extension.h>
 #include <shell/e-shell-window.h>
 #include <shell/e-shell-window-actions.h>
 
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 75ef5d8..1184948 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -21,11 +21,11 @@
 #endif
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-alert-dialog.h>
-#include <e-util/e-extension.h>
 #include <e-util/e-import.h>
 
 #include <mail/e-mail-backend.h>
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index d215459..f3110b2 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -32,6 +32,8 @@
 #include <eventsys.h>
 #else
 
+#include <libebackend/e-extension.h>
+
 /* Extract relevant typedefs from mingw-w64 headers */
 
 typedef struct IEnumEventObject IEnumEventObject;
@@ -195,7 +197,6 @@ struct ISensNetwork {
 #endif
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* 4E14FB9F-2E22-11D1-9964-00C04FBBB345 */
 DEFINE_GUID (IID_IEventSystem, 0x4E14FB9F, 0x2E22, 0x11D1, 0x99, 0x64, 0x00, 0xC0, 0x4F, 0xBB, 0xB3, 0x45);
diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 3364b16..ae600ba 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 a109ffb..c7a4151 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 e0c10c6..13b0b49 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 abe37b7..62652de 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 1bfe01e..77c1fd2 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 1ddbd35..adc0d27 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 49e05ba..370aa90 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 6a9744d..d36a3e6 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 dbcb55b..2954765 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"
 
diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h
index e85cd9b..81a883d 100644
--- a/widgets/misc/e-attachment-handler.h
+++ b/widgets/misc/e-attachment-handler.h
@@ -22,7 +22,7 @@
 #ifndef E_ATTACHMENT_HANDLER_H
 #define E_ATTACHMENT_HANDLER_H
 
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
 #include <misc/e-attachment-view.h>
 
 /* Standard GObject macros */
diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c
index 9dd7825..cf14d97 100644
--- a/widgets/misc/e-attachment-icon-view.c
+++ b/widgets/misc/e-attachment-icon-view.c
@@ -26,7 +26,7 @@
 #include "e-attachment-icon-view.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-attachment.h"
 #include "e-attachment-store.h"
diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c
index 5293120..7c67fdb 100644
--- a/widgets/misc/e-attachment-tree-view.c
+++ b/widgets/misc/e-attachment-tree-view.c
@@ -26,7 +26,7 @@
 #include "e-attachment-tree-view.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-attachment.h"
 #include "e-attachment-store.h"
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index d3f42fd..c7f2e04 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <libebackend/e-extensible.h>
+
 #include "e-calendar-item.h"
 #include "ea-widgets.h"
 
@@ -36,7 +38,6 @@
 #include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extensible.h>
 
 static const gint e_calendar_item_days_in_month[12] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 2a9eb7f..970a06b 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -37,10 +37,10 @@
 #include <atk/atkrelation.h>
 #include <atk/atkrelationset.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extensible.h>
 #include "e-calendar.h"
 
 struct _EDateEditPrivate {
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 06dff88..a2588cd 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -32,9 +32,9 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-import.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-util-private.h>
 
 typedef struct _ImportFilePage ImportFilePage;
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 8e037ac..c35bbcc 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -26,11 +26,11 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-util.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-popup-action.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]