diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-05-23 00:12:00 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-05-23 00:12:00 +0800 |
commit | e7ad5d121bca3ba68221582ea56b0feed8b7881e (patch) | |
tree | 400470af8fbe180684ccd065e68f061a7eebfd8d /shell/e-shell.c | |
parent | f4d6507475e46a353a831c8161b58d3cef9adfb0 (diff) | |
download | gsoc2013-evolution-e7ad5d121bca3ba68221582ea56b0feed8b7881e.tar.gz gsoc2013-evolution-e7ad5d121bca3ba68221582ea56b0feed8b7881e.tar.zst gsoc2013-evolution-e7ad5d121bca3ba68221582ea56b0feed8b7881e.zip |
Only refuse quitting if the result is CANCEL. This way we allow quitting
* e-shell.c (e_shell_prepare_for_quit): Only refuse quitting if
the result is CANCEL. This way we allow quitting if one of the
components has crashed or something else otherwise goes wrong.
Fixes #25093.
* evolution-shell-component-client.c
(result_from_async_corba_result): Handle
GNOME_Evolution_ShellComponentListener_CANCEL.
svn path=/trunk/; revision=16974
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r-- | shell/e-shell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 3799a2b513..f2f41baa32 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -2200,7 +2200,7 @@ e_shell_prepare_for_quit (EShell *shell) while (result == (GNOME_Evolution_ShellComponentListener_Result) -1) gtk_main_iteration (); - if (result != GNOME_Evolution_ShellComponentListener_OK) { + if (result == GNOME_Evolution_ShellComponentListener_CANCEL) { retval = FALSE; goto end; } |