diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
| commit | c0a255eb90769638d57ae4122932f75c46e4e531 (patch) | |
| tree | 5213694107a246763c25c0a089553dd7c8708b32 /composer/e-composer-actions.c | |
| parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
| download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.bz2 gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.lz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.xz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip | |
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'composer/e-composer-actions.c')
| -rw-r--r-- | composer/e-composer-actions.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 07ec555452..3146d9614b 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -127,9 +127,8 @@ action_close_cb (GtkAction *action, editor = GTKHTML_EDITOR (composer); widget = GTK_WIDGET (composer); - if (!gtkhtml_editor_get_changed (editor) && - e_composer_autosave_get_saved (composer)) { - + if (!gtkhtml_editor_get_changed (editor) || + e_msg_composer_is_exiting (composer)) { gtk_widget_destroy (widget); return; } @@ -699,7 +698,7 @@ e_composer_actions_init (EMsgComposer *composer) G_OBJECT (ACTION (ATTACH)), "short-label", _("Attach"), NULL); -#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED) +#if defined (HAVE_NSS) visible = TRUE; #else visible = FALSE; |