[geary/bug/728002-webkit2: 95/140] Convert ComposerWidget destroy handler back to an overridden method.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/bug/728002-webkit2: 95/140] Convert ComposerWidget destroy handler back to an overridden method.
- Date: Tue, 31 Jan 2017 23:06:31 +0000 (UTC)
commit 4e9104a79bded5da26cd1374e2e161f6c71bf6c5
Author: Michael James Gratton <mike vee net>
Date: Tue Jan 17 17:28:01 2017 +1100
Convert ComposerWidget destroy handler back to an overridden method.
src/client/composer/composer-widget.vala | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index ff881b5..e982475 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) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]