aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-03-31 21:30:03 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-04-01 00:10:54 +0800
commit7c38b34f2073ce895957a87da3113f19d62da86d (patch)
tree197b48d627cf0bfd9e97ce2128c05d38ea923244
parent6a5767cbd1fb6390478a888d94677a6ecb1d123f (diff)
downloadgsoc2013-evolution-7c38b34f2073ce895957a87da3113f19d62da86d.tar
gsoc2013-evolution-7c38b34f2073ce895957a87da3113f19d62da86d.tar.gz
gsoc2013-evolution-7c38b34f2073ce895957a87da3113f19d62da86d.tar.bz2
gsoc2013-evolution-7c38b34f2073ce895957a87da3113f19d62da86d.tar.lz
gsoc2013-evolution-7c38b34f2073ce895957a87da3113f19d62da86d.tar.xz
gsoc2013-evolution-7c38b34f2073ce895957a87da3113f19d62da86d.tar.zst
gsoc2013-evolution-7c38b34f2073ce895957a87da3113f19d62da86d.zip
Remove e_shell_get_startup_view().
No longer needed.
-rw-r--r--doc/reference/libeshell/libeshell-sections.txt1
-rw-r--r--modules/startup-wizard/evolution-startup-wizard.c10
-rw-r--r--shell/e-shell.c7
-rw-r--r--shell/e-shell.h1
4 files changed, 0 insertions, 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
<SUBSECTION Standard>
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