callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Milan Crha <mcrha@redhat.com> ** Fix for bug #545661 (Skip question for not-saved only when not changed or application is exiting).

Browse Source 
svn path=/trunk/; revision=36241
This commit is contained in:
Suman Manjunath
2008-09-01 04:35:02 +00:00
parent b52cf4cc09
commit 65edf39de9
5 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
composer/ChangeLog
View File

@ -1,3 +1,14 @@
2008-09-01 Milan Crha <mcrha@redhat.com>
** Fix for bug #545661
* e-composer-autosave.c: (e_composer_autosave_snapshot):
Do not mark composer as not changed, that's not truth possibly.
* e-msg-composer.h: (e_msg_composer_is_exiting):
* e-msg-composer.c: (e_msg_composer_is_exiting):
* e-composer-actions.c: (action_close_cb): Skip question
for "not-saved" only when not changed or application is exiting.
2008-08-27 Sankar P <psankar@novell.com>
License Changes

5
composer/e-composer-actions.c
View File

@ -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;
}

4
composer/e-composer-autosave.c
View File

@ -324,7 +324,9 @@ e_composer_autosave_snapshot (EMsgComposer *composer)
}
/* Snapshot was successful; set various flags. */
gtkhtml_editor_set_changed (editor, FALSE);
/* do not touch "changed" flag, this is only autosave,
which doesn't mean it's saved permanently */
e_composer_autosave_set_saved (composer, TRUE);
camel_object_unref (message);

8
composer/e-msg-composer.c
View File

@ -4596,6 +4596,14 @@ e_msg_composer_set_enable_autosave (EMsgComposer *composer,
e_composer_autosave_set_enabled (composer, enabled);
}
gboolean
e_msg_composer_is_exiting (EMsgComposer *composer)
{
g_return_val_if_fail (composer != NULL, FALSE);
return composer->priv->application_exiting;
}
gboolean
e_msg_composer_request_close_all (void)
{

2
composer/e-msg-composer.h
View File

@ -156,6 +156,8 @@ struct _EAttachmentBar *
e_msg_composer_get_attachment_bar
(EMsgComposer *composer);
gboolean e_msg_composer_is_exiting (EMsgComposer *composer);
G_END_DECLS
#endif /* E_MSG_COMPOSER_H */