From a650f15f0090d68a503b5b11561bfb3cdb4663dc Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 22 Apr 2010 17:27:20 +0530 Subject: Store the initial view request and use that to decide whether to show startup wizard or not. Show only for mail and not calendar. --- plugins/startup-wizard/startup-wizard.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'plugins/startup-wizard') diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index a38b2d9e9a..97d2297480 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -66,7 +66,15 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) GSList *accounts; EConfig *config; EMAccountEditor *emae; + char *req_view; + req_view = e_shell_get_startup_view(e_shell_get_default()); + + if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode(e_shell_get_default())) { + return; + } + + client = gconf_client_get_default (); accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); g_object_unref (client); -- cgit v1.2.3 From 3e1b34841d3a699f77848f5de019f18ccb2d1ca1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 09:41:48 -0400 Subject: Fix compiler warnings. --- plugins/startup-wizard/startup-wizard.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/startup-wizard') diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 97d2297480..77be99f80f 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -60,17 +60,19 @@ 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; - char *req_view; + const gchar *req_view; - req_view = e_shell_get_startup_view(e_shell_get_default()); + 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(e_shell_get_default())) { + if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode (shell)) { return; } @@ -86,7 +88,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); -- cgit v1.2.3 From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- plugins/startup-wizard/startup-wizard.c | 1 - 1 file changed, 1 deletion(-) (limited to 'plugins/startup-wizard') diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 77be99f80f..f6e5dcc34e 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -76,7 +76,6 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) return; } - client = gconf_client_get_default (); accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); g_object_unref (client); -- cgit v1.2.3