2 files changed, 0 insertions, 22 deletions
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 4e0aa52038..0642691c49 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 ef3cdb5afe..1ddeaa5168 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 (