diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-10-06 04:06:57 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-10-06 04:06:57 +0800 |
| commit | 3d76b85133e04ee93d227eb6a7dda79bb5204643 (patch) | |
| tree | ee628afa0ecd4b6c195d13a390de1f689de156b3 | |
| parent | a19af27803a7c021eb631102194aeb959b273ea5 (diff) | |
| download | gsoc2013-evolution-3d76b85133e04ee93d227eb6a7dda79bb5204643.tar.gz gsoc2013-evolution-3d76b85133e04ee93d227eb6a7dda79bb5204643.tar.zst gsoc2013-evolution-3d76b85133e04ee93d227eb6a7dda79bb5204643.zip | |
Do not invoke `e_shell_restore_from_settings()' if `shell' is NULL.
* main.c (idle_cb): Do not invoke
`e_shell_restore_from_settings()' if `shell' is NULL.
svn path=/trunk/; revision=13462
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/main.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 2b23c12358..81f7c0e9ec 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,10 @@ 2001-10-05 Ettore Perazzoli <ettore@ximian.com> + * main.c (idle_cb): Do not invoke + `e_shell_restore_from_settings()' if `shell' is NULL. + +2001-10-05 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c (e_shell_view_save_settings): Get the right hpaned positions for when the shortcut bar and/or the folder bar are visible. diff --git a/shell/main.c b/shell/main.c index 5260ea5696..7ceac7e537 100644 --- a/shell/main.c +++ b/shell/main.c @@ -260,7 +260,7 @@ idle_cb (void *data) } if (! have_evolution_uri) { - if (! e_shell_restore_from_settings (shell)) { + if (shell == NULL || ! e_shell_restore_from_settings (shell)) { const char *uri; uri = E_SHELL_VIEW_DEFAULT_URI; |