From e8e4661811e980102e5569f804c0f439aa7b3c32 Mon Sep 17 00:00:00 2001 From: Matthew Barnes 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/startup-wizard/Makefile.am | 5 ----- modules/startup-wizard/evolution-startup-wizard.c | 17 ----------------- 2 files changed, 22 deletions(-) (limited to 'modules/startup-wizard') 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 #include -#ifdef WITH_CAPPLET -#include -#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 ( -- cgit v1.2.3