From 7c38b34f2073ce895957a87da3113f19d62da86d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 31 Mar 2013 09:30:03 -0400 Subject: Remove e_shell_get_startup_view(). No longer needed. --- doc/reference/libeshell/libeshell-sections.txt | 1 - modules/startup-wizard/evolution-startup-wizard.c | 10 ---------- shell/e-shell.c | 7 ------- shell/e-shell.h | 1 - 4 files changed, 19 deletions(-) diff --git a/doc/reference/libeshell/libeshell-sections.txt b/doc/reference/libeshell/libeshell-sections.txt index ce1e894570..3359bbd4b5 100644 --- a/doc/reference/libeshell/libeshell-sections.txt +++ b/doc/reference/libeshell/libeshell-sections.txt @@ -27,7 +27,6 @@ EShellQuitReason e_shell_quit e_shell_cancel_quit e_shell_set_startup_view -e_shell_get_startup_view e_shell_migrate_attempt E_SHELL diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 03c70b7e66..b14b85ecb0 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -161,24 +161,14 @@ startup_wizard_weak_ref_cb (gpointer data, static void startup_wizard_run (EStartupWizard *extension) { - EShell *shell; GtkWidget *window = NULL; - const gchar *startup_view; - gboolean express_mode; /* Accounts should now be loaded if there were any to load. * Check, and proceed with the Evolution Setup Assistant. */ - shell = startup_wizard_get_shell (extension); - express_mode = e_shell_get_express_mode (shell); - startup_view = e_shell_get_startup_view (shell); - if (startup_wizard_have_mail_account (extension)) return; - if (express_mode && g_strcmp0 (startup_view, "mail") != 0) - return; - if (window == NULL) { window = startup_wizard_new_assistant (extension); g_signal_connect ( diff --git a/shell/e-shell.c b/shell/e-shell.c index 16b8026e53..49786c8517 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1791,10 +1791,3 @@ e_shell_set_startup_view (EShell *shell, shell->priv->startup_view = g_strdup (view); } -const gchar * -e_shell_get_startup_view (EShell *shell) -{ - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->startup_view; -} diff --git a/shell/e-shell.h b/shell/e-shell.h index f7edf8140d..34a1a8f6fa 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -145,7 +145,6 @@ void e_shell_cancel_quit (EShell *shell); void e_shell_set_startup_view (EShell *shell, const gchar *view); -const gchar * e_shell_get_startup_view (EShell *shell); G_END_DECLS -- cgit v1.2.3