nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Closes #7374 Fix various holes were drafts weren't deleted

Browse source
This commit is contained in:
Eric Gregory 2013-10-02 16:15:45 -07:00
parent aa1175b2ab
commit f5c0b9b260
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/client/composer/composer-window.vala
View file

@ -188,6 +188,7 @@ public class ComposerWindow : Gtk.Window {
private uint draft_save_timeout_id = 0;
private Cancellable cancellable_drafts = new Cancellable();
private Cancellable cancellable_save_draft = new Cancellable();
private bool in_draft_save = false;
private WebKit.WebView editor;
// We need to keep a reference to the edit-fixer in composer-window, so it doesn't get
@ -817,7 +818,11 @@ public class ComposerWindow : Gtk.Window {
// Save to the draft folder, if available.
// Note that drafts are NOT "linkified."
private bool save_draft() {
save_async.begin(cancellable_save_draft);
if (in_draft_save)
return false;
in_draft_save = true;
save_async.begin(cancellable_save_draft, () => { in_draft_save = false; });
return false;
}
@ -836,7 +841,7 @@ public class ComposerWindow : Gtk.Window {
// only save HTML drafts to avoid resetting the DOM (which happens when converting the
// HTML to flowed text)
draft_id = yield drafts_folder.create_email_async(new Geary.RFC822.Message.from_composed_email(
get_composed_email(null, true)), flags, null, draft_id, null);
get_composed_email(null, true)), flags, null, draft_id, cancellable);
draft_save_label.label = DRAFT_SAVED_TEXT;
} catch (Error e) {
@ -885,7 +890,7 @@ public class ComposerWindow : Gtk.Window {
destroy();
}
private async void delete_draft_async(Cancellable? cancellable = null) {
private async void delete_draft_async() {
if (drafts_folder == null || draft_id == null)
return;

14
src/engine/imap-engine/imap-engine-generic-folder.vala
View file

@ -1198,17 +1198,21 @@ private class Geary.ImapEngine.GenericFolder : Geary.AbstractFolder, Geary.Folde
throw e;
}
Geary.FolderSupport.Remove? remove_folder = this as Geary.FolderSupport.Remove;
// Remove old message.
if (id != null) {
Geary.FolderSupport.Remove? remove_folder = this as Geary.FolderSupport.Remove;
if (remove_folder != null)
yield remove_folder.remove_single_email_async(id, null);
}
if (id != null && remove_folder != null)
yield remove_folder.remove_single_email_async(id, null);
// If the user cancelled the operation, throw the error here.
if (cancel_error != null)
throw cancel_error;
// If the caller cancelled during the remove operation, delete the newly created message to
// safely back out.
if (cancellable != null && cancellable.is_cancelled() && ret != null && remove_folder != null)
yield remove_folder.remove_single_email_async(ret, null);
return ret;
}
}