aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@gnome.org>2010-03-02 20:14:10 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-03-14 09:49:49 +0800
commit8e0c294e15ca3f765e330b1d6ae892b768453fa9 (patch)
tree13985e325b0f5e53a5d7b47f496a91bc21e8bbc4 /modules/mail
parenta952896b27334756b349c1f6f25db6b2021aab4f (diff)
downloadgsoc2013-evolution-8e0c294e15ca3f765e330b1d6ae892b768453fa9.tar
gsoc2013-evolution-8e0c294e15ca3f765e330b1d6ae892b768453fa9.tar.gz
gsoc2013-evolution-8e0c294e15ca3f765e330b1d6ae892b768453fa9.tar.bz2
gsoc2013-evolution-8e0c294e15ca3f765e330b1d6ae892b768453fa9.tar.lz
gsoc2013-evolution-8e0c294e15ca3f765e330b1d6ae892b768453fa9.tar.xz
gsoc2013-evolution-8e0c294e15ca3f765e330b1d6ae892b768453fa9.tar.zst
gsoc2013-evolution-8e0c294e15ca3f765e330b1d6ae892b768453fa9.zip
Switch to anjal style on express mode.
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/em-account-prefs.c33
1 files changed, 18 insertions, 15 deletions
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 13ede1f867..b74915b0f8 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 "shell/e-shell.h"
#include "capplet/mail-capplet-shell.h"
#define EM_ACCOUNT_PREFS_GET_PRIVATE(obj) \
@@ -112,21 +113,23 @@ 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
- * @Class: org.gnome.evolution.mail.config:1.0
- * @Target: EMConfigTargetAccount
- *
- * The new mail account assistant.
- */
- emae = em_account_editor_new (
- NULL, EMAE_ASSISTANT,
- "org.gnome.evolution.mail.config.accountAssistant");
- priv->assistant = emae->editor;
-#endif
- priv->assistant = mail_capplet_shell_new (0, TRUE, FALSE);
+
+ if (!e_shell_get_express_mode (e_shell_get_default ())) {
+ /** @HookPoint-EMConfig: New Mail Account Assistant
+ * @Id: org.gnome.evolution.mail.config.accountAssistant
+ * @Type: E_CONFIG_ASSISTANT
+ * @Class: org.gnome.evolution.mail.config:1.0
+ * @Target: EMConfigTargetAccount
+ *
+ * The new mail account assistant.
+ */
+ emae = em_account_editor_new (
+ NULL, EMAE_ASSISTANT,
+ "org.gnome.evolution.mail.config.accountAssistant");
+ priv->assistant = emae->editor;
+ } else {
+ 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);