aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-08-11 00:47:57 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-08-11 01:03:30 +0800
commite8e4661811e980102e5569f804c0f439aa7b3c32 (patch)
tree30a8bbfcde078d20e67594c635816081bef5397f /modules
parent6a791bb6e813ec5ec42b0d72eca775208b877e06 (diff)
downloadgsoc2013-evolution-e8e4661811e980102e5569f804c0f439aa7b3c32.tar
gsoc2013-evolution-e8e4661811e980102e5569f804c0f439aa7b3c32.tar.gz
gsoc2013-evolution-e8e4661811e980102e5569f804c0f439aa7b3c32.tar.bz2
gsoc2013-evolution-e8e4661811e980102e5569f804c0f439aa7b3c32.tar.lz
gsoc2013-evolution-e8e4661811e980102e5569f804c0f439aa7b3c32.tar.xz
gsoc2013-evolution-e8e4661811e980102e5569f804c0f439aa7b3c32.tar.zst
gsoc2013-evolution-e8e4661811e980102e5569f804c0f439aa7b3c32.zip
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.
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/Makefile.am5
-rw-r--r--modules/mail/e-mail-shell-backend.c17
-rw-r--r--modules/startup-wizard/Makefile.am5
-rw-r--r--modules/startup-wizard/evolution-startup-wizard.c17
4 files changed, 0 insertions, 44 deletions
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);
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 (