diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
| commit | c9ec8c3f4dce2b02c91268529977770364ef87fe (patch) | |
| tree | d574f2be1b5438407e59e2fead1321766c9bbc83 /plugins/startup-wizard | |
| parent | 6fec6bf39467dd32625847be1b021a7e5bc94d76 (diff) | |
| parent | 96538878911586a9e9ca26b81e1916c04e538980 (diff) | |
| download | gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.gz gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.bz2 gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.lz gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.xz gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.zst gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.zip | |
Merge branch 'express2'
Diffstat (limited to 'plugins/startup-wizard')
| -rw-r--r-- | plugins/startup-wizard/startup-wizard.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index e232df4dea..904e630487 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -67,12 +67,21 @@ startup_wizard_close (void) { void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) { + EShell *shell; GtkWidget *start_page; GtkLabel *start_page_label; GConfClient *client; GSList *accounts; EConfig *config; EMAccountEditor *emae; + const gchar *req_view; + + shell = e_shell_get_default (); + req_view = e_shell_get_startup_view (shell); + + if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode (shell)) { + return; + } client = gconf_client_get_default (); accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); @@ -85,7 +94,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) return; } - if (e_shell_get_express_mode (e_shell_get_default ())) { + if (e_shell_get_express_mode (shell)) { start_page = (GtkWidget *)mail_capplet_shell_new (0, TRUE, TRUE); gtk_widget_show (start_page); |