Add a "settings" module.

Collect all the "config" extensions from the "addressbook", "calendar",
and "mail" modules into one place.  These extensions typically just bind
GObject properties of extensible classes to app-specific GSettings keys.

16 files changed, 0 insertions, 1374 deletions

diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 35e630ed82..e8ec2af362 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -17,22 +17,8 @@ module_calendar_la_SOURCES = \
 	e-calendar-preferences.h			\
 	e-cal-attachment-handler.c			\
 	e-cal-attachment-handler.h			\
-	e-cal-config-calendar-item.c			\
-	e-cal-config-calendar-item.h			\
-	e-cal-config-comp-editor.c			\
-	e-cal-config-comp-editor.h			\
-	e-cal-config-date-edit.c			\
-	e-cal-config-date-edit.h			\
 	e-cal-config-hook.c				\
 	e-cal-config-hook.h				\
-	e-cal-config-meeting-store.c			\
-	e-cal-config-meeting-store.h			\
-	e-cal-config-meeting-time-selector.c		\
-	e-cal-config-meeting-time-selector.h		\
-	e-cal-config-model.c				\
-	e-cal-config-model.h				\
-	e-cal-config-view.c				\
-	e-cal-config-view.h				\
 	e-cal-event-hook.c				\
 	e-cal-event-hook.h				\
 	e-cal-shell-backend.c				\
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
deleted file mode 100644
index ddf6835893..0000000000
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * e-cal-config-calendar-item.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-config-calendar-item.h"
-
-#include <shell/e-shell.h>
-
-#define E_CAL_CONFIG_CALENDAR_ITEM_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CAL_CONFIG_CALENDAR_ITEM, ECalConfigCalendarItemPrivate))
-
-struct _ECalConfigCalendarItemPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	ECalConfigCalendarItem,
-	e_cal_config_calendar_item,
-	E_TYPE_EXTENSION)
-
-static void
-cal_config_calendar_item_constructed (GObject *object)
-{
-	EExtension *extension;
-	EExtensible *extensible;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property (
-		shell_settings, "cal-show-week-numbers",
-		extensible, "show-week-numbers",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-week-start-day",
-		extensible, "week-start-day",
-		G_BINDING_SYNC_CREATE);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_cal_config_calendar_item_parent_class)->
-		constructed (object);
-}
-
-static void
-e_cal_config_calendar_item_class_init (ECalConfigCalendarItemClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (
-		class, sizeof (ECalConfigCalendarItemPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = cal_config_calendar_item_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_CALENDAR_ITEM;
-}
-
-static void
-e_cal_config_calendar_item_class_finalize (ECalConfigCalendarItemClass *class)
-{
-}
-
-static void
-e_cal_config_calendar_item_init (ECalConfigCalendarItem *extension)
-{
-	extension->priv = E_CAL_CONFIG_CALENDAR_ITEM_GET_PRIVATE (extension);
-}
-
-void
-e_cal_config_calendar_item_type_register (GTypeModule *type_module)
-{
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
-	 *     function, so we have to wrap it with a public function in
-	 *     order to register types from a separate compilation unit. */
-	e_cal_config_calendar_item_register_type (type_module);
-}
-
diff --git a/modules/calendar/e-cal-config-calendar-item.h b/modules/calendar/e-cal-config-calendar-item.h
deleted file mode 100644
index 83bc7149f3..0000000000
--- a/modules/calendar/e-cal-config-calendar-item.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * e-cal-config-calendar-item.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_CAL_CONFIG_CALENDAR_ITEM_H
-#define E_CAL_CONFIG_CALENDAR_ITEM_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_CAL_CONFIG_CALENDAR_ITEM \
-	(e_cal_config_calendar_item_get_type ())
-#define E_CAL_CONFIG_CALENDAR_ITEM(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CAL_CONFIG_CALENDAR_ITEM, ECalConfigCalendarItem))
-#define E_CAL_CONFIG_CALENDAR_ITEM_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CAL_CONFIG_CALENDAR_ITEM, ECalConfigCalendarItemClass))
-#define E_IS_CAL_CONFIG_CALENDAR_ITEM(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CAL_CONFIG_CALENDAR_ITEM))
-#define E_IS_CAL_CONFIG_CALENDAR_ITEM_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CAL_CONFIG_CALENDAR_ITEM))
-#define E_CAL_CONFIG_CALENDAR_ITEM_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CAL_CONFIG_CALENDAR_ITEM, ECalConfigCalendarItemClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalConfigCalendarItem ECalConfigCalendarItem;
-typedef struct _ECalConfigCalendarItemClass ECalConfigCalendarItemClass;
-typedef struct _ECalConfigCalendarItemPrivate ECalConfigCalendarItemPrivate;
-
-struct _ECalConfigCalendarItem {
-	EExtension parent;
-	ECalConfigCalendarItemPrivate *priv;
-};
-
-struct _ECalConfigCalendarItemClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_cal_config_calendar_item_get_type
-						(void) G_GNUC_CONST;
-void		e_cal_config_calendar_item_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_CAL_CONFIG_CALENDAR_ITEM_H */
-
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
deleted file mode 100644
index 98991b43b2..0000000000
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * e-cal-config-comp-editor.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-config-comp-editor.h"
-
-#include <shell/e-shell.h>
-#include <calendar/gui/dialogs/comp-editor.h>
-
-#define E_CAL_CONFIG_COMP_EDITOR_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CAL_CONFIG_COMP_EDITOR, ECalConfigCompEditorPrivate))
-
-struct _ECalConfigCompEditorPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	ECalConfigCompEditor,
-	e_cal_config_comp_editor,
-	E_TYPE_EXTENSION)
-
-static void
-cal_config_comp_editor_constructed (GObject *object)
-{
-	EExtension *extension;
-	EExtensible *extensible;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property (
-		shell_settings, "cal-timezone",
-		extensible, "timezone",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-use-24-hour-format",
-		extensible, "use-24-hour-format",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-end-hour",
-		extensible, "work-day-end-hour",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-end-minute",
-		extensible, "work-day-end-minute",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-start-hour",
-		extensible, "work-day-start-hour",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-start-minute",
-		extensible, "work-day-start-minute",
-		G_BINDING_SYNC_CREATE);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_cal_config_comp_editor_parent_class)->
-		constructed (object);
-}
-
-static void
-e_cal_config_comp_editor_class_init (ECalConfigCompEditorClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (class, sizeof (ECalConfigCompEditorPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = cal_config_comp_editor_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = TYPE_COMP_EDITOR;
-}
-
-static void
-e_cal_config_comp_editor_class_finalize (ECalConfigCompEditorClass *class)
-{
-}
-
-static void
-e_cal_config_comp_editor_init (ECalConfigCompEditor *extension)
-{
-	extension->priv = E_CAL_CONFIG_COMP_EDITOR_GET_PRIVATE (extension);
-}
-
-void
-e_cal_config_comp_editor_type_register (GTypeModule *type_module)
-{
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
-	 *     function, so we have to wrap it with a public function in
-	 *     order to register types from a separate compilation unit. */
-	e_cal_config_comp_editor_register_type (type_module);
-}
-
diff --git a/modules/calendar/e-cal-config-comp-editor.h b/modules/calendar/e-cal-config-comp-editor.h
deleted file mode 100644
index ee75a46508..0000000000
--- a/modules/calendar/e-cal-config-comp-editor.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * e-cal-config-comp-editor.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_CAL_CONFIG_COMP_EDITOR_H
-#define E_CAL_CONFIG_COMP_EDITOR_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_CAL_CONFIG_COMP_EDITOR \
-	(e_cal_config_comp_editor_get_type ())
-#define E_CAL_CONFIG_COMP_EDITOR(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CAL_CONFIG_COMP_EDITOR, ECalConfigCompEditor))
-#define E_CAL_CONFIG_COMP_EDITOR_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CAL_CONFIG_COMP_EDITOR, ECalConfigCompEditorClass))
-#define E_IS_CAL_CONFIG_COMP_EDITOR(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CAL_CONFIG_COMP_EDITOR))
-#define E_IS_CAL_CONFIG_COMP_EDITOR_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CAL_CONFIG_COMP_EDITOR))
-#define E_CAL_CONFIG_COMP_EDITOR_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CAL_CONFIG_COMP_EDITOR, ECalConfigCompEditorClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalConfigCompEditor ECalConfigCompEditor;
-typedef struct _ECalConfigCompEditorClass ECalConfigCompEditorClass;
-typedef struct _ECalConfigCompEditorPrivate ECalConfigCompEditorPrivate;
-
-struct _ECalConfigCompEditor {
-	EExtension parent;
-	ECalConfigCompEditorPrivate *priv;
-};
-
-struct _ECalConfigCompEditorClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_cal_config_comp_editor_get_type
-						(void) G_GNUC_CONST;
-void		e_cal_config_comp_editor_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_CAL_CONFIG_COMP_EDITOR_H */
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
deleted file mode 100644
index 0ac7e6e2cf..0000000000
--- a/modules/calendar/e-cal-config-date-edit.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * e-cal-config-date-edit.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-config-date-edit.h"
-
-#include <shell/e-shell.h>
-
-#define E_CAL_CONFIG_DATE_EDIT_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CAL_CONFIG_DATE_EDIT, ECalConfigDateEditPrivate))
-
-struct _ECalConfigDateEditPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	ECalConfigDateEdit,
-	e_cal_config_date_edit,
-	E_TYPE_EXTENSION)
-
-static void
-cal_config_date_edit_constructed (GObject *object)
-{
-	EExtension *extension;
-	EExtensible *extensible;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property (
-		shell_settings, "cal-show-week-numbers",
-		extensible, "show-week-numbers",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-week-start-day",
-		extensible, "week-start-day",
-		G_BINDING_SYNC_CREATE);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_cal_config_date_edit_parent_class)->
-		constructed (object);
-}
-
-static void
-e_cal_config_date_edit_class_init (ECalConfigDateEditClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (class, sizeof (ECalConfigDateEditPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = cal_config_date_edit_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_DATE_EDIT;
-}
-
-static void
-e_cal_config_date_edit_class_finalize (ECalConfigDateEditClass *class)
-{
-}
-
-static void
-e_cal_config_date_edit_init (ECalConfigDateEdit *extension)
-{
-	extension->priv = E_CAL_CONFIG_DATE_EDIT_GET_PRIVATE (extension);
-}
-
-void
-e_cal_config_date_edit_type_register (GTypeModule *type_module)
-{
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
-	 *     function, so we have to wrap it with a public function in
-	 *     order to register types from a separate compilation unit. */
-	e_cal_config_date_edit_register_type (type_module);
-}
-
diff --git a/modules/calendar/e-cal-config-date-edit.h b/modules/calendar/e-cal-config-date-edit.h
deleted file mode 100644
index eacccba0e4..0000000000
--- a/modules/calendar/e-cal-config-date-edit.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * e-cal-config-date-edit.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_CAL_CONFIG_DATE_EDIT_H
-#define E_CAL_CONFIG_DATE_EDIT_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_CAL_CONFIG_DATE_EDIT \
-	(e_cal_config_date_edit_get_type ())
-#define E_CAL_CONFIG_DATE_EDIT(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CAL_CONFIG_DATE_EDIT, ECalConfigDateEdit))
-#define E_CAL_CONFIG_DATE_EDIT_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CAL_CONFIG_DATE_EDIT, ECalConfigDateEditClass))
-#define E_IS_CAL_CONFIG_DATE_EDIT(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CAL_CONFIG_DATE_EDIT))
-#define E_IS_CAL_CONFIG_DATE_EDIT_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CAL_CONFIG_DATE_EDIT))
-#define E_CAL_CONFIG_DATE_EDIT_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CAL_CONFIG_DATE_EDIT, ECalConfigDateEditClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalConfigDateEdit ECalConfigDateEdit;
-typedef struct _ECalConfigDateEditClass ECalConfigDateEditClass;
-typedef struct _ECalConfigDateEditPrivate ECalConfigDateEditPrivate;
-
-struct _ECalConfigDateEdit {
-	EExtension parent;
-	ECalConfigDateEditPrivate *priv;
-};
-
-struct _ECalConfigDateEditClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_cal_config_date_edit_get_type	(void) G_GNUC_CONST;
-void		e_cal_config_date_edit_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_CAL_CONFIG_DATE_EDIT_H */
-
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
deleted file mode 100644
index 98b59c363b..0000000000
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * e-cal-config-meeting-store.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-config-meeting-store.h"
-
-#include <shell/e-shell.h>
-#include <calendar/gui/e-meeting-store.h>
-
-#define E_CAL_CONFIG_MEETING_STORE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CAL_CONFIG_MEETING_STORE, ECalConfigMeetingStorePrivate))
-
-struct _ECalConfigMeetingStorePrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	ECalConfigMeetingStore,
-	e_cal_config_meeting_store,
-	E_TYPE_EXTENSION)
-
-static void
-cal_config_meeting_store_constructed (GObject *object)
-{
-	EExtension *extension;
-	EExtensible *extensible;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property (
-		shell_settings, "cal-default-reminder-interval",
-		extensible, "default-reminder-interval",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-default-reminder-units",
-		extensible, "default-reminder-units",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-free-busy-template",
-		extensible, "free-busy-template",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-timezone",
-		extensible, "timezone",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-week-start-day",
-		extensible, "week-start-day",
-		G_BINDING_SYNC_CREATE);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_cal_config_meeting_store_parent_class)->
-		constructed (object);
-}
-
-static void
-e_cal_config_meeting_store_class_init (ECalConfigMeetingStoreClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (
-		class, sizeof (ECalConfigMeetingStorePrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = cal_config_meeting_store_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_MEETING_STORE;
-}
-
-static void
-e_cal_config_meeting_store_class_finalize (ECalConfigMeetingStoreClass *class)
-{
-}
-
-static void
-e_cal_config_meeting_store_init (ECalConfigMeetingStore *extension)
-{
-	extension->priv = E_CAL_CONFIG_MEETING_STORE_GET_PRIVATE (extension);
-}
-
-void
-e_cal_config_meeting_store_type_register (GTypeModule *type_module)
-{
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
-	 *     function, so we have to wrap it with a public function in
-	 *     order to register types from a separate compilation unit. */
-	e_cal_config_meeting_store_register_type (type_module);
-}
-
diff --git a/modules/calendar/e-cal-config-meeting-store.h b/modules/calendar/e-cal-config-meeting-store.h
deleted file mode 100644
index d0a9dfc02b..0000000000
--- a/modules/calendar/e-cal-config-meeting-store.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * e-cal-config-meeting-store.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_CAL_CONFIG_MEETING_STORE_H
-#define E_CAL_CONFIG_MEETING_STORE_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_CAL_CONFIG_MEETING_STORE \
-	(e_cal_config_meeting_store_get_type ())
-#define E_CAL_CONFIG_MEETING_STORE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CAL_CONFIG_MEETING_STORE, ECalConfigMeetingStore))
-#define E_CAL_CONFIG_MEETING_STORE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CAL_CONFIG_MEETING_STORE, ECalConfigMeetingStoreClass))
-#define E_IS_CAL_CONFIG_MEETING_STORE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CAL_CONFIG_MEETING_STORE))
-#define E_IS_CAL_CONFIG_MEETING_STORE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CAL_CONFIG_MEETING_STORE))
-#define E_CAL_CONFIG_MEETING_STORE_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CaL_CONFIG_MEETING_STORE, ECalConfigMeetingStoreClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalConfigMeetingStore ECalConfigMeetingStore;
-typedef struct _ECalConfigMeetingStoreClass ECalConfigMeetingStoreClass;
-typedef struct _ECalConfigMeetingStorePrivate ECalConfigMeetingStorePrivate;
-
-struct _ECalConfigMeetingStore {
-	EExtension parent;
-	ECalConfigMeetingStorePrivate *priv;
-};
-
-struct _ECalConfigMeetingStoreClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_cal_config_meeting_store_get_type
-						(void) G_GNUC_CONST;
-void		e_cal_config_meeting_store_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_CAL_CONFIG_MEETING_STORE_H */
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
deleted file mode 100644
index 3877067aa0..0000000000
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * e-cal-config-meeting-time-selector.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-config-meeting-time-selector.h"
-
-#include <shell/e-shell.h>
-#include <calendar/gui/e-meeting-time-sel.h>
-
-#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR, ECalConfigMeetingTimeSelectorPrivate))
-
-struct _ECalConfigMeetingTimeSelectorPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	ECalConfigMeetingTimeSelector,
-	e_cal_config_meeting_time_selector,
-	E_TYPE_EXTENSION)
-
-static void
-cal_config_meeting_time_selector_constructed (GObject *object)
-{
-	EExtension *extension;
-	EExtensible *extensible;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property (
-		shell_settings, "cal-show-week-numbers",
-		extensible, "show-week-numbers",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-use-24-hour-format",
-		extensible, "use-24-hour-format",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-week-start-day",
-		extensible, "week-start-day",
-		G_BINDING_SYNC_CREATE);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_cal_config_meeting_time_selector_parent_class)->
-		constructed (object);
-}
-
-static void
-e_cal_config_meeting_time_selector_class_init (ECalConfigMeetingTimeSelectorClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (
-		class, sizeof (ECalConfigMeetingTimeSelectorPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = cal_config_meeting_time_selector_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_MEETING_TIME_SELECTOR;
-}
-
-static void
-e_cal_config_meeting_time_selector_class_finalize (ECalConfigMeetingTimeSelectorClass *class)
-{
-}
-
-static void
-e_cal_config_meeting_time_selector_init (ECalConfigMeetingTimeSelector *extension)
-{
-	extension->priv =
-		E_CAL_CONFIG_MEETING_TIME_SELECTOR_GET_PRIVATE (extension);
-}
-
-void
-e_cal_config_meeting_time_selector_type_register (GTypeModule *type_module)
-{
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
-	 *     function, so we have to wrap it with a public function in
-	 *     order to register types from a separate compilation unit. */
-	e_cal_config_meeting_time_selector_register_type (type_module);
-}
-
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.h b/modules/calendar/e-cal-config-meeting-time-selector.h
deleted file mode 100644
index a2ede27baf..0000000000
--- a/modules/calendar/e-cal-config-meeting-time-selector.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * e-cal-config-meeting-time-selector.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_CAL_CONFIG_MEETING_TIME_SELECTOR_H
-#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR \
-	(e_cal_config_meeting_time_selector_get_type ())
-#define E_CAL_CONFIG_MEETING_TIME_SELECTOR(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR, ECalConfigMeetingTimeSelector))
-#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR, ECalConfigMeetingTimeSelectorClass))
-#define E_IS_CAL_CONFIG_MEETING_TIME_SELECTOR(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR))
-#define E_IS_CAL_CONFIG_MEETING_TIME_SELECTOR_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR))
-#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CAL_CONFIG_MEETING_TIME_SELECTOR, ECalConfigMeetingTimeSelectorClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalConfigMeetingTimeSelector ECalConfigMeetingTimeSelector;
-typedef struct _ECalConfigMeetingTimeSelectorClass ECalConfigMeetingTimeSelectorClass;
-typedef struct _ECalConfigMeetingTimeSelectorPrivate ECalConfigMeetingTimeSelectorPrivate;
-
-struct _ECalConfigMeetingTimeSelector {
-	EExtension parent;
-	ECalConfigMeetingTimeSelectorPrivate *priv;
-};
-
-struct _ECalConfigMeetingTimeSelectorClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_cal_config_meeting_time_selector_get_type
-						(void) G_GNUC_CONST;
-void		e_cal_config_meeting_time_selector_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_CAL_CONFIG_MEETING_TIME_SELECTOR_H */
-
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
deleted file mode 100644
index fea96c767a..0000000000
--- a/modules/calendar/e-cal-config-model.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * e-cal-config-model.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-config-model.h"
-
-#include <shell/e-shell.h>
-#include <calendar/gui/e-cal-model.h>
-#include <calendar/gui/e-cal-model-tasks.h>
-
-#define E_CAL_CONFIG_MODEL_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModelPrivate))
-
-struct _ECalConfigModelPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	ECalConfigModel,
-	e_cal_config_model,
-	E_TYPE_EXTENSION)
-
-static void
-cal_config_model_constructed (GObject *object)
-{
-	EExtension *extension;
-	EExtensible *extensible;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	/*** ECalModel ***/
-
-	g_object_bind_property (
-		shell_settings, "cal-compress-weekend",
-		extensible, "compress-weekend",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-confirm-delete",
-		extensible, "confirm-delete",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-default-reminder-interval",
-		extensible, "default-reminder-interval",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-default-reminder-units",
-		extensible, "default-reminder-units",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-timezone",
-		extensible, "timezone",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-use-24-hour-format",
-		extensible, "use-24-hour-format",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-use-default-reminder",
-		extensible, "use-default-reminder",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-week-start-day",
-		extensible, "week-start-day",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-end-hour",
-		extensible, "work-day-end-hour",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-end-minute",
-		extensible, "work-day-end-minute",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-start-hour",
-		extensible, "work-day-start-hour",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "cal-work-day-start-minute",
-		extensible, "work-day-start-minute",
-		G_BINDING_SYNC_CREATE);
-
-	/*** ECalModelTasks ***/
-
-	if (E_IS_CAL_MODEL_TASKS (extensible)) {
-
-		g_object_bind_property (
-			shell_settings, "cal-tasks-highlight-due-today",
-			extensible, "highlight-due-today",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-tasks-color-due-today",
-			extensible, "color-due-today",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-tasks-highlight-overdue",
-			extensible, "highlight-overdue",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-tasks-color-overdue",
-			extensible, "color-overdue",
-			G_BINDING_SYNC_CREATE);
-	}
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_cal_config_model_parent_class)->constructed (object);
-}
-
-static void
-e_cal_config_model_class_init (ECalConfigModelClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (class, sizeof (ECalConfigModelPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = cal_config_model_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_CAL_MODEL;
-}
-
-static void
-e_cal_config_model_class_finalize (ECalConfigModelClass *class)
-{
-}
-
-static void
-e_cal_config_model_init (ECalConfigModel *extension)
-{
-	extension->priv = E_CAL_CONFIG_MODEL_GET_PRIVATE (extension);
-}
-
-void
-e_cal_config_model_type_register (GTypeModule *type_module)
-{
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
-	 *     function, so we have to wrap it with a public function in
-	 *     order to register types from a separate compilation unit. */
-	e_cal_config_model_register_type (type_module);
-}
-
diff --git a/modules/calendar/e-cal-config-model.h b/modules/calendar/e-cal-config-model.h
deleted file mode 100644
index e5d0456e23..0000000000
--- a/modules/calendar/e-cal-config-model.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * e-cal-config-model.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_CAL_CONFIG_MODEL_H
-#define E_CAL_CONFIG_MODEL_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_CAL_CONFIG_MODEL \
-	(e_cal_config_model_get_type ())
-#define E_CAL_CONFIG_MODEL(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModel))
-#define E_CAL_CONFIG_MODEL_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModelClass))
-#define E_IS_CAL_CONFIG_MODEL(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CAL_CONFIG_MODEL))
-#define E_IS_CAL_CONFIG_MODEL_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CAL_CONFIG_MODEL))
-#define E_CAL_CONFIG_MODEL_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CAL_CONFIG_MODEL, ECalConfigModelClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalConfigModel ECalConfigModel;
-typedef struct _ECalConfigModelClass ECalConfigModelClass;
-typedef struct _ECalConfigModelPrivate ECalConfigModelPrivate;
-
-struct _ECalConfigModel {
-	EExtension parent;
-	ECalConfigModelPrivate *priv;
-};
-
-struct _ECalConfigModelClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_cal_config_model_get_type	(void) G_GNUC_CONST;
-void		e_cal_config_model_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_CAL_CONFIG_MODEL_H */
-
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
deleted file mode 100644
index 38651bd390..0000000000
--- a/modules/calendar/e-cal-config-view.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * e-cal-config-view.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-cal-config-view.h"
-
-#include <shell/e-shell.h>
-#include <calendar/gui/e-day-view.h>
-#include <calendar/gui/e-week-view.h>
-
-#define E_CAL_CONFIG_VIEW_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CAL_CONFIG_VIEW, ECalConfigViewPrivate))
-
-struct _ECalConfigViewPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	ECalConfigView,
-	e_cal_config_view,
-	E_TYPE_EXTENSION)
-
-static void
-cal_config_view_constructed (GObject *object)
-{
-	EExtension *extension;
-	EExtensible *extensible;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property (
-		shell_settings, "cal-time-divisions",
-		extensible, "time-divisions",
-		G_BINDING_BIDIRECTIONAL |
-		G_BINDING_SYNC_CREATE);
-
-	/*** EDayView ***/
-
-	if (E_IS_DAY_VIEW (extensible)) {
-
-		g_object_bind_property (
-			shell_settings, "cal-show-week-numbers",
-			E_DAY_VIEW (extensible)->week_number_label, "visible",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-marcus-bains-show-line",
-			extensible, "marcus-bains-show-line",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-marcus-bains-day-view-color",
-			extensible, "marcus-bains-day-view-color",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-marcus-bains-time-bar-color",
-			extensible, "marcus-bains-time-bar-color",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-working-days-bitset",
-			extensible, "working-days",
-			G_BINDING_SYNC_CREATE);
-	}
-
-	/*** EWeekView ***/
-
-	if (E_IS_WEEK_VIEW (extensible)) {
-
-		g_object_bind_property (
-			shell_settings, "cal-compress-weekend",
-			extensible, "compress-weekend",
-			G_BINDING_SYNC_CREATE);
-
-		g_object_bind_property (
-			shell_settings, "cal-show-event-end-times",
-			extensible, "show-event-end-times",
-			G_BINDING_SYNC_CREATE);
-	}
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_cal_config_view_parent_class)->constructed (object);
-}
-
-static void
-e_cal_config_view_class_init (ECalConfigViewClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (class, sizeof (ECalConfigViewPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = cal_config_view_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_CALENDAR_VIEW;
-}
-
-static void
-e_cal_config_view_class_finalize (ECalConfigViewClass *class)
-{
-}
-
-static void
-e_cal_config_view_init (ECalConfigView *extension)
-{
-	extension->priv = E_CAL_CONFIG_VIEW_GET_PRIVATE (extension);
-}
-
-void
-e_cal_config_view_type_register (GTypeModule *type_module)
-{
-	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
-	 *     function, so we have to wrap it with a public function in
-	 *     order to register types from a separate compilation unit. */
-	e_cal_config_view_register_type (type_module);
-}
-
diff --git a/modules/calendar/e-cal-config-view.h b/modules/calendar/e-cal-config-view.h
deleted file mode 100644
index 3c9f1dbe02..0000000000
--- a/modules/calendar/e-cal-config-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * e-cal-config-view.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_CAL_CONFIG_VIEW_H
-#define E_CAL_CONFIG_VIEW_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_CAL_CONFIG_VIEW \
-	(e_cal_config_view_get_type ())
-#define E_CAL_CONFIG_VIEW(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CAL_CONFIG_VIEW, ECalConfigView))
-#define E_CAL_CONFIG_VIEW_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CAL_CONFIG_VIEW, ECalConfigViewClass))
-#define E_IS_CAL_CONFIG_VIEW(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CAL_CONFIG_VIEW))
-#define E_IS_CAL_CONFIG_VIEW_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CAL_CONFIG_VIEW))
-#define E_CAL_CONFIG_VIEW_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CAL_CONFIG_VIEW, ECalConfigViewClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalConfigView ECalConfigView;
-typedef struct _ECalConfigViewClass ECalConfigViewClass;
-typedef struct _ECalConfigViewPrivate ECalConfigViewPrivate;
-
-struct _ECalConfigView {
-	EExtension parent;
-	ECalConfigViewPrivate *priv;
-};
-
-struct _ECalConfigViewClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_cal_config_view_get_type	(void) G_GNUC_CONST;
-void		e_cal_config_view_type_register	(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_CAL_CONFIG_VIEW_H */
-
diff --git a/modules/calendar/evolution-module-calendar.c b/modules/calendar/evolution-module-calendar.c
index f3ac75b038..86cfa1f729 100644
--- a/modules/calendar/evolution-module-calendar.c
+++ b/modules/calendar/evolution-module-calendar.c
@@ -43,14 +43,6 @@
 #include "e-task-shell-sidebar.h"
 #include "e-task-shell-view.h"
 
-#include "e-cal-config-calendar-item.h"
-#include "e-cal-config-comp-editor.h"
-#include "e-cal-config-date-edit.h"
-#include "e-cal-config-meeting-store.h"
-#include "e-cal-config-meeting-time-selector.h"
-#include "e-cal-config-model.h"
-#include "e-cal-config-view.h"
-
 #include "e-calendar-preferences.h"
 
 /* Module Entry Points */
@@ -82,14 +74,6 @@ e_module_load (GTypeModule *type_module)
 	e_task_shell_sidebar_type_register (type_module);
 	e_task_shell_view_register_type (type_module);
 
-	e_cal_config_calendar_item_type_register (type_module);
-	e_cal_config_comp_editor_type_register (type_module);
-	e_cal_config_date_edit_type_register (type_module);
-	e_cal_config_meeting_store_type_register (type_module);
-	e_cal_config_meeting_time_selector_type_register (type_module);
-	e_cal_config_model_type_register (type_module);
-	e_cal_config_view_type_register (type_module);
-
 	e_calendar_preferences_type_register (type_module);
 }