aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/Makefile.am1
-rw-r--r--modules/mail/em-account-prefs.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index bf0b9f1cce..de9eac5ada 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -61,6 +61,7 @@ libevolution_module_mail_la_LIBADD = \
$(top_builddir)/em-format/libemformat.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(top_builddir)/filter/libfilter.la \
+ $(top_builddir)/capplet/libevolution-mail-settings.la \
$(EVOLUTION_MAIL_LIBS) \
$(CAMEL_LIBS) \
$(GTKHTML_LIBS) \
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index ac58ea421d..13ede1f867 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -39,6 +39,7 @@
#include "e-mail-store.h"
#include "em-config.h"
#include "em-account-editor.h"
+#include "capplet/mail-capplet-shell.h"
#define EM_ACCOUNT_PREFS_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -111,7 +112,7 @@ account_prefs_add_account (EAccountManager *manager)
parent = gtk_widget_get_toplevel (GTK_WIDGET (manager));
parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
-
+#if 0
/** @HookPoint-EMConfig: New Mail Account Assistant
* @Id: org.gnome.evolution.mail.config.accountAssistant
* @Type: E_CONFIG_ASSISTANT
@@ -124,6 +125,8 @@ account_prefs_add_account (EAccountManager *manager)
NULL, EMAE_ASSISTANT,
"org.gnome.evolution.mail.config.accountAssistant");
priv->assistant = emae->editor;
+#endif
+ priv->assistant = mail_capplet_shell_new (0, TRUE, FALSE);
g_object_add_weak_pointer (G_OBJECT (priv->assistant), &priv->assistant);
gtk_window_set_transient_for (GTK_WINDOW (priv->assistant), parent);