aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-08-18 12:37:15 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-18 12:37:15 +0800
commitf19618ac7f06b7f9e4bb2d7ce2e75de6e8554737 (patch)
treed6481a36d0a743a7b7ccbd249c94f76cd707d6ae /shell/e-shell.c
parentfce40453c9aece0fcdd523fe80ff1cc573747844 (diff)
downloadgsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.tar
gsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.tar.gz
gsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.tar.bz2
gsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.tar.lz
gsoc2013-evolution-f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737.tar.xz
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.c')
-rw-r--r--shell/e-shell.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 6173f47498..948f7c41e3 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -117,6 +117,9 @@ struct _EShellPrivate {
/* Whether quit has been requested, and the shell is now waiting for
permissions from all the components to quit. */
unsigned int preparing_to_quit : 1;
+
+ /* Whether we are recovering from a crash in the previous session. */
+ unsigned int crash_recovery : 1;
};
@@ -1214,6 +1217,23 @@ e_shell_go_online (EShell *shell,
set_line_status(shell, shell_state);
}
+gboolean
+e_shell_get_crash_recovery (EShell *shell)
+{
+ g_return_val_if_fail (E_IS_SHELL (shell), NULL);
+
+ return shell->priv->crash_recovery;
+}
+
+void
+e_shell_set_crash_recovery (EShell *shell,
+ gboolean crash_recovery)
+{
+ g_return_if_fail (E_IS_SHELL (shell));
+
+ shell->priv->crash_recovery = crash_recovery;
+}
+
void
e_shell_send_receive (EShell *shell)
{