aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-08-17 12:29:11 +0800
committerIain Holmes <iain@src.gnome.org>2001-08-17 12:29:11 +0800
commit4e60b7d947fc081958acc7b4e17dfdf4e62ec08b (patch)
tree08b84d5b30af9b675acec8c133acf72ec57e14ef /shell/e-shell.c
parentdad6d45018fb264dbb94031775b6c4589951e50a (diff)
downloadgsoc2013-evolution-4e60b7d947fc081958acc7b4e17dfdf4e62ec08b.tar
gsoc2013-evolution-4e60b7d947fc081958acc7b4e17dfdf4e62ec08b.tar.gz
gsoc2013-evolution-4e60b7d947fc081958acc7b4e17dfdf4e62ec08b.tar.bz2
gsoc2013-evolution-4e60b7d947fc081958acc7b4e17dfdf4e62ec08b.tar.lz
gsoc2013-evolution-4e60b7d947fc081958acc7b4e17dfdf4e62ec08b.tar.xz
gsoc2013-evolution-4e60b7d947fc081958acc7b4e17dfdf4e62ec08b.tar.zst
gsoc2013-evolution-4e60b7d947fc081958acc7b4e17dfdf4e62ec08b.zip
Startup assistant stuff
svn path=/trunk/; revision=12145
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r--shell/e-shell.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 08a9ee4607..ea6e25bcd4 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -961,9 +961,24 @@ e_shell_construct (EShell *shell,
can tell the components we are here. */
set_owner_on_components (shell);
- /* Run the intelligent importers to find see if any data needs
- importing. */
- intelligent_importer_init ();
+ if (show_splash) {
+ gtk_widget_destroy (splash);
+ }
+
+ if (e_shell_startup_wizard_create () == FALSE) {
+ /* FIXME: Need to kill all components somehow */
+ exit (0);
+ }
+ shortcut_path = g_concat_dir_and_file (local_directory, "shortcuts.xml");
+ priv->shortcuts = e_shortcuts_new (priv->storage_set,
+ priv->folder_type_registry,
+ shortcut_path);
+ g_assert (priv->shortcuts != NULL);
+
+ if (e_shortcuts_get_num_groups (priv->shortcuts) == 0)
+ e_shortcuts_add_default_group (priv->shortcuts);
+
+ g_free (shortcut_path);
if (show_splash)
gtk_widget_destroy (splash);