[geary/bug/728002-webkit2: 88/140] Minor draft-related code cleanup.

[Michael Gratton <mjog src gnome org>]

commit 034727cc049bada2b5fc879d1ce3ffc893a76ecc
Author: Michael James Gratton <mike vee net>
Date:   Mon Jan 16 12:00:27 2017 +1100

    Minor draft-related code cleanup.

 src/client/application/geary-controller.vala |    2 +-
 src/client/composer/composer-widget.vala     |   57 +++++++++++++------------
 2 files changed, 31 insertions(+), 28 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index fcde502..b151abc 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -2361,7 +2361,7 @@ public class GearyController : Geary.BaseObject {
         try {
             yield widget.open_draft_manager_async(draft_id);
         } catch (Error e) {
-            message("Could not open draft manager: %s", e.message);
+            debug("Could not open draft manager: %s", e.message);
         }
 
         // For accounts with large numbers of contacts, loading the
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index b887bca..ab3ec8f 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -673,17 +673,6 @@ public class ComposerWidget : Gtk.EventBox {
         }
     }
 
-    // This code is in a separate method due to https://bugzilla.gnome.org/show_bug.cgi?id=742621
-    // connect_to_draft_manager() is simply for symmetry.  When above bug is fixed, this code can
-    // be moved back into open/close methods
-    private void disconnect_from_draft_manager() {
-        this.draft_manager.notify[Geary.App.DraftManager.PROP_DRAFT_STATE]
-            .disconnect(on_draft_state_changed);
-        this.draft_manager.notify[Geary.App.DraftManager.PROP_CURRENT_DRAFT_ID]
-            .disconnect(on_draft_id_changed);
-        this.draft_manager.fatal.disconnect(on_draft_manager_fatal);
-    }
-
     /**
      * Creates and opens the composer's draft manager.
      */
@@ -1304,6 +1293,33 @@ public class ComposerWidget : Gtk.EventBox {
         this.container.close_container();
     }
 
+    private async void close_draft_manager_async(Cancellable? cancellable) throws Error {
+        get_action(ACTION_CLOSE_AND_SAVE).set_enabled(false);
+        if (this.draft_manager == null)
+            return;
+
+        disconnect_from_draft_manager();
+
+        // drop ref even if close failed
+        try {
+            yield this.draft_manager.close_async(cancellable);
+        } finally {
+            this.draft_manager = null;
+        }
+        debug("Draft manager closed");
+    }
+
+    // This code is in a separate method due to https://bugzilla.gnome.org/show_bug.cgi?id=742621
+    // connect_to_draft_manager() is simply for symmetry.  When above bug is fixed, this code can
+    // be moved back into open/close methods
+    private void disconnect_from_draft_manager() {
+        this.draft_manager.notify[Geary.App.DraftManager.PROP_DRAFT_STATE]
+            .disconnect(on_draft_state_changed);
+        this.draft_manager.notify[Geary.App.DraftManager.PROP_CURRENT_DRAFT_ID]
+            .disconnect(on_draft_id_changed);
+        this.draft_manager.fatal.disconnect(on_draft_manager_fatal);
+    }
+
     private void update_draft_state() {
         switch (this.draft_manager.draft_state) {
             case Geary.App.DraftManager.DraftState.STORED:
@@ -1329,21 +1345,6 @@ public class ComposerWidget : Gtk.EventBox {
             default:
                 assert_not_reached();
         }
-
-    private async void close_draft_manager_async(Cancellable? cancellable) throws Error {
-        get_action(ACTION_CLOSE_AND_SAVE).set_enabled(false);
-        if (this.draft_manager == null)
-            return;
-
-        disconnect_from_draft_manager();
-
-        // drop ref even if close failed
-        try {
-            yield this.draft_manager.close_async(cancellable);
-        } finally {
-            this.draft_manager = null;
-        }
-        debug("Draft manager closed");
     }
 
     private inline void draft_changed() {
@@ -2130,13 +2131,15 @@ public class ComposerWidget : Gtk.EventBox {
         } catch (Error err) {
             debug("Unable to update From: Account in composer: %s", err.message);
         }
-        
+
         // if the Geary.Account didn't change and the drafts folder is open(ing), do nothing more;
         // need to check for the drafts folder because opening it in the case of multiple From:
         // is handled here alone, so changed open it if not already
         if (!changed && this.draft_manager != null)
             return;
 
+        // XXX Need to work out what do to with any existing draft in
+        // this case. See Bug 713533.
         this.open_draft_manager_async.begin(null, null, (obj, res) => {
                 try {
                     this.open_draft_manager_async.end(res);