diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-08-18 12:37:15 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-18 12:37:15 +0800 |
| commit | f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737 (patch) | |
| tree | d6481a36d0a743a7b7ccbd249c94f76cd707d6ae /shell/e-shell-window.c | |
| parent | fce40453c9aece0fcdd523fe80ff1cc573747844 (diff) | |
| download | gsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.tar.gz gsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.tar.zst gsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.zip | |
** Fixes bug #508732
2008-08-18 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #508732
* shell/e-shell.c:
Add a "crash_recovery" flag, with accessor functions for it.
* shell/e-shell-window (init_view):
Check and reset the "crash_recovery" flag before creating a
new shell view. The components can use this flag to take
steps to recover from the previous crash.
* shell/apps_evolution_shell.schemas.in:
Remove the "skip_recovery_dialog" and "recovery" keys.
* shell/Evolution-Component.idl (createView):
Add a "select_item" boolean parameter.
* shell/main.c:
Kill the crash recovery dialog. Instead just set the crash
recovery flag in e-shell appropriately.
* mail/mail-component.c (impl_createView):
Add a "select_item" argument for crash recovery, which we forward
to EMFolderBrowser as a "suppress_message_selection" flag.
* mail/em-folder-browser.c (emfb_set_folder):
Suppress automatic message selection if we are recovering from a
crash.
* addressbook/gui/component/addressbook-component.c (impl_createView):
* calendar/gui/calendar-component.c (impl_createView):
* calendar/gui/memos-component.c (impl_createView):
* calendar/gui/tasks-component.c (impl_createView):
Add a "select_item" argument for crash recovery, which these
components do not use.
* help/C/evolution.xml:
Remove the bit about crash recovery.
svn path=/trunk/; revision=36009
Diffstat (limited to 'shell/e-shell-window.c')
| -rw-r--r-- | shell/e-shell-window.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index cf188e27e7..0bef6caaee 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -210,6 +210,7 @@ init_view (EShellWindow *window, Bonobo_Control sidebar_control; Bonobo_Control view_control; Bonobo_Control statusbar_control; + CORBA_boolean select_item; CORBA_Environment ev; int sidebar_notebook_page_num; int view_notebook_page_num; @@ -218,6 +219,9 @@ init_view (EShellWindow *window, g_return_if_fail (view->sidebar_widget == NULL); g_return_if_fail (view->notebook_page_num == -1); + select_item = !e_shell_get_crash_recovery (priv->shell.eshell); + e_shell_set_crash_recovery (priv->shell.eshell, FALSE); + CORBA_exception_init (&ev); /* 1. Activate component. (FIXME: Shouldn't do this here.) */ @@ -238,7 +242,7 @@ init_view (EShellWindow *window, (e.g. methods not implemented)... So handle it as if there was no component at all. */ - component_view = GNOME_Evolution_Component_createView(component_iface, BONOBO_OBJREF(priv->shell_view), &ev); + component_view = GNOME_Evolution_Component_createView(component_iface, BONOBO_OBJREF(priv->shell_view), select_item, &ev); if (component_view == NULL || BONOBO_EX (&ev)) { g_warning ("Cannot create view for %s", view->component_id); bonobo_object_release_unref (component_iface, NULL); |