From 4e9104a79bded5da26cd1374e2e161f6c71bf6c5 Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Tue, 17 Jan 2017 17:28:01 +1100
Subject: [PATCH] Convert ComposerWidget destroy handler back to an overridden
 method.

---
 src/client/composer/composer-widget.vala | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index ff881b55..e982475f 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -523,13 +523,13 @@ public class ComposerWidget : Gtk.EventBox {
         chain.append(this.composer_toolbar);
         chain.append(this.attachments_box);
         this.composer_container.set_focus_chain(chain);
+    }
 
-        // Don't do this in an overridden version of the destroy
-        // method, it somehow ends up in an infinite loop
-        destroy.connect(() => {
-                if (this.draft_manager != null)
-                    close_draft_manager_async.begin(null);
-            });
+    public override void destroy() {
+        this.draft_timer.reset();
+        if (this.draft_manager != null)
+            close_draft_manager_async.begin(null);
+        base.destroy();
     }
 
     public ComposerWidget.from_mailto(Geary.Account account, string mailto, Configuration config) {