From e8e4661811e980102e5569f804c0f439aa7b3c32 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 10 Aug 2012 12:47:57 -0400
Subject: Remove the settings capplet.

The evolution-settings capplet was originally designed for Anjal, it was
used in MeeGo as part of the Express Mode effort, but doesn't really fit
in GNOME 3 nowadays (nor did it really fit in GNOME 2, in my opinion).

This is pretty clearly dead weight at this point.  The MeeGo developers
have disappeared, and the remaining Evolution developers are not and do
not intend to maintain it.  Plus it doesn't even build currently.
---
 modules/mail/Makefile.am            |  5 -----
 modules/mail/e-mail-shell-backend.c | 17 -----------------
 2 files changed, 22 deletions(-)

(limited to 'modules/mail')

diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 7d7f298b6c..74391b28ce 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -49,11 +49,6 @@ module_mail_la_SOURCES = \
 	em-network-prefs.c						\
 	em-network-prefs.h
 
-if WITH_CAPPLET
-libevolution_mail_settings_la = \
-	$(top_builddir)/capplet/settings/libevolution-mail-settings.la
-endif
-
 module_mail_la_LIBADD = \
 	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la		\
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 2079d28cdc..8b00ccf0a2 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -33,10 +33,6 @@
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
 
-#ifdef WITH_CAPPLET
-#include <capplet/settings/mail-capplet-shell.h>
-#endif
-
 #include <composer/e-msg-composer.h>
 
 #include <widgets/misc/e-preferences-window.h>
@@ -793,11 +789,6 @@ e_mail_shell_backend_new_account (EMailShellBackend *mail_shell_backend,
 	EMailBackend *backend;
 	EMailSession *session;
 
-#ifdef WITH_CAPPLET
-	EShell *shell;
-	EShellBackend *shell_backend;
-#endif /* WITH_CAPPLET */
-
 	g_return_if_fail (mail_shell_backend != NULL);
 	g_return_if_fail (E_IS_MAIL_SHELL_BACKEND (mail_shell_backend));
 
@@ -811,14 +802,6 @@ e_mail_shell_backend_new_account (EMailShellBackend *mail_shell_backend,
 	backend = E_MAIL_BACKEND (mail_shell_backend);
 	session = e_mail_backend_get_session (backend);
 
-#ifdef WITH_CAPPLET
-	shell_backend = E_SHELL_BACKEND (mail_shell_backend);
-	shell = e_shell_backend_get_shell (shell_backend);
-
-	if (e_shell_get_express_mode (shell))
-		assistant = mail_capplet_shell_new (0, TRUE, FALSE);
-#endif /* WITH_CAPPLET */
-
 	if (assistant == NULL)
 		assistant = e_mail_config_assistant_new (session);
 
-- 
cgit v1.2.3