[evolution] Remove the settings capplet.

[Matthew Barnes <mbarnes src gnome org>]

commit e8e4661811e980102e5569f804c0f439aa7b3c32
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Aug 10 12:47:57 2012 -0400

    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.

 Makefile.am                                       |    5 -
 capplet/.gitignore                                |   24 -
 capplet/Makefile.am                               |   67 --
 capplet/anjal-settings-main.c                     |  196 ----
 capplet/settings/Makefile.am                      |   68 --
 capplet/settings/anjal-mail-view.c                |   80 --
 capplet/settings/anjal-mail-view.h                |   58 -
 capplet/settings/mail-account-view.c              | 1177 ---------------------
 capplet/settings/mail-account-view.h              |   93 --
 capplet/settings/mail-capplet-shell.c             |  302 ------
 capplet/settings/mail-capplet-shell.h             |   59 -
 capplet/settings/mail-settings-view.c             |  297 ------
 capplet/settings/mail-settings-view.h             |   59 -
 capplet/settings/mail-view.c                      |  656 ------------
 capplet/settings/mail-view.h                      |   87 --
 configure.ac                                      |   16 -
 data/Makefile.am                                  |    6 +-
 modules/mail/Makefile.am                          |    5 -
 modules/mail/e-mail-shell-backend.c               |   17 -
 modules/startup-wizard/Makefile.am                |    5 -
 modules/startup-wizard/evolution-startup-wizard.c |   17 -
 po/POTFILES.in                                    |    6 -
 22 files changed, 1 insertions(+), 3299 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1372472..015fcf5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,10 +39,6 @@ if ENABLE_SMIME
 SMIME_SUBDIR=smime
 endif
 
-if WITH_CAPPLET
-CAPPLET_SUBDIR=capplet
-endif
-
 if WITH_HELP
 HELP_SUBDIR=help
 endif
@@ -71,7 +67,6 @@ SUBDIRS = 			\
 	composer		\
 	mail			\
 	calendar		\
-	$(CAPPLET_SUBDIR)	\
 	art			\
 	plugins			\
 	modules			\
diff --git a/configure.ac b/configure.ac
index af96021..27ad00c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,20 +293,6 @@ AC_ARG_WITH([help],
 AM_CONDITIONAL(WITH_HELP, test "x$with_help" != "xno")
 AC_MSG_RESULT([$with_help])
 
-dnl ****************
-dnl Settings Capplet
-dnl ****************
-AC_MSG_CHECKING([whether to build the settings capplet])
-AC_ARG_WITH([capplet],
-	[AS_HELP_STRING([--with-capplet],
-	[Build the account settings capplet [default=no]])],
-	[with_capplet="$withval"],[with_capplet="no"])
-if test "x$with_capplet" = "xyes"; then
-	AC_DEFINE(WITH_CAPPLET, 1, [Define if building the settings capplet])
-fi
-AM_CONDITIONAL(WITH_CAPPLET, test "x$with_capplet" = "xyes")
-AC_MSG_RESULT([$with_capplet])
-
 dnl ******************************
 dnl iconv checking
 dnl ******************************
@@ -1588,8 +1574,6 @@ smime/Makefile
 smime/lib/Makefile
 smime/gui/Makefile
 sounds/Makefile
-capplet/Makefile
-capplet/settings/Makefile
 evolution-zip
 evolution-calendar.pc
 evolution-mail.pc
diff --git a/data/Makefile.am b/data/Makefile.am
index 05a1d57..9790533 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1,7 @@
 SUBDIRS = icons
 
-if WITH_CAPPLET
-evolution_settings_desktop_in = evolution-settings.desktop.in
-endif
-
 desktopdir = $(datadir)/applications
-desktop_in_files = evolution.desktop.in $(evolution_settings_desktop_in)
+desktop_in_files = evolution.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 autostartdir = $(sysconfdir)/xdg/autostart
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 7d7f298..74391b2 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 2079d28..8b00ccf 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);
 
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 4e0aa52..0642691 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -21,11 +21,6 @@ module_startup_wizard_la_SOURCES = \
 	e-mail-config-import-progress-page.h			\
 	$(NULL)
 
-if WITH_CAPPLET
-libevolution_mail_settings_la = \
-	$(top_builddir)/capplet/settings/libevolution-mail-settings.la
-endif
-
 module_startup_wizard_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index ef3cdb5..1ddeaa5 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -32,10 +32,6 @@
 #include <mail/e-mail-config-assistant.h>
 #include <mail/e-mail-config-welcome-page.h>
 
-#ifdef WITH_CAPPLET
-#include <capplet/settings/mail-capplet-shell.h>
-#endif
-
 #include "e-startup-assistant.h"
 #include "e-mail-config-import-page.h"
 #include "e-mail-config-import-progress-page.h"
@@ -105,14 +101,6 @@ startup_wizard_new_assistant (EStartupWizard *extension)
 	return e_startup_assistant_new (session);
 }
 
-#ifdef WITH_CAPPLET
-static GtkWidget *
-startup_wizard_new_capplet (EStartupWizard *extension)
-{
-	return mail_capplet_shell_new (0, TRUE, TRUE);
-}
-#endif /* WITH_CAPPLET */
-
 static gboolean
 startup_wizard_have_mail_account (EStartupWizard *extension)
 {
@@ -194,11 +182,6 @@ startup_wizard_run (EStartupWizard *extension)
 	if (express_mode && g_strcmp0 (startup_view, "mail") != 0)
 		return;
 
-#ifdef WITH_CAPPLET
-	if (express_mode)
-		window = startup_wizard_new_capplet (extension);
-#endif /* WITH_CAPPLET */
-
 	if (window == NULL) {
 		window = startup_wizard_new_assistant (extension);
 		g_signal_connect (
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c62210b..5265689 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -119,12 +119,6 @@ calendar/gui/tasktypes.xml
 calendar/gui/weekday-picker.c
 calendar/importers/icalendar-importer.c
 calendar/zones.h
-capplet/anjal-settings-main.c
-capplet/settings/anjal-mail-view.c
-capplet/settings/mail-account-view.c
-capplet/settings/mail-capplet-shell.c
-capplet/settings/mail-settings-view.c
-capplet/settings/mail-view.c
 composer/e-composer-actions.c
 composer/e-composer-header.c
 composer/e-composer-header-table.c