From ccfd1f036071e77bf8278d3c171a89c2a5bbde10 Mon Sep 17 00:00:00 2001 From: Charles Lindsay Date: Wed, 12 Mar 2014 12:14:01 -0700 Subject: [PATCH] Initialize opening_monitor in local folders Closes: bgo #725850 --- src/engine/abstract/geary-abstract-local-folder.vala | 4 ++++ src/engine/api/geary-search-folder.vala | 2 ++ src/engine/imap-db/outbox/smtp-outbox-folder.vala | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/engine/abstract/geary-abstract-local-folder.vala b/src/engine/abstract/geary-abstract-local-folder.vala index 7f831ee0..bbc64c9c 100644 --- a/src/engine/abstract/geary-abstract-local-folder.vala +++ b/src/engine/abstract/geary-abstract-local-folder.vala @@ -10,6 +10,10 @@ public abstract class Geary.AbstractLocalFolder : Geary.AbstractFolder { private int open_count = 0; + public AbstractLocalFolder() { + opening_monitor = new Geary.SimpleProgressMonitor(Geary.ProgressType.ACTIVITY); + } + public override Geary.Folder.OpenState get_open_state() { return open_count > 0 ? Geary.Folder.OpenState.LOCAL : Geary.Folder.OpenState.CLOSED; } diff --git a/src/engine/api/geary-search-folder.vala b/src/engine/api/geary-search-folder.vala index b8f32a91..518b409a 100644 --- a/src/engine/api/geary-search-folder.vala +++ b/src/engine/api/geary-search-folder.vala @@ -66,6 +66,8 @@ public class Geary.SearchFolder : Geary.AbstractLocalFolder, Geary.FolderSupport public signal void search_query_changed(string? query); public SearchFolder(Account account) { + base(); + _account = account; account.folders_available_unavailable.connect(on_folders_available_unavailable); diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder.vala b/src/engine/imap-db/outbox/smtp-outbox-folder.vala index f7912429..9499affe 100644 --- a/src/engine/imap-db/outbox/smtp-outbox-folder.vala +++ b/src/engine/imap-db/outbox/smtp-outbox-folder.vala @@ -70,6 +70,8 @@ private class Geary.SmtpOutboxFolder : Geary.AbstractLocalFolder, Geary.FolderSu // Requires the Database from the get-go because it runs a background task that access it // whether open or not public SmtpOutboxFolder(ImapDB.Database db, Account account, Geary.ProgressMonitor sending_monitor) { + base(); + this.db = db; _account = account; this.sending_monitor = sending_monitor;