[geary/wip/713190-resort-2: 2/2] Merge branch 'master' into wip/713190-resort-2

[Jim Nelson <jnelson src gnome org>]

commit 8b1d56ab3542542ac032e0c3f2844a814ae85564
Merge: 1e5dba3 cec8b3f
Author: Jim Nelson <jim yorba org>
Date:   Wed Jan 21 16:33:53 2015 -0800

    Merge branch 'master' into wip/713190-resort-2

 .../conversation-list/conversation-list-store.vala |    5 +++++
 .../conversation-list/conversation-list-view.vala  |   13 +++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --cc src/client/conversation-list/conversation-list-store.vala
index 31b5050,179937b..13b0035
--- a/src/client/conversation-list/conversation-list-store.vala
+++ b/src/client/conversation-list/conversation-list-store.vala
@@@ -50,36 -35,15 +50,37 @@@ public class ConversationListStore : Gt
          }
      }
      
 -    public string? account_owner_email { get; set; default = null; }
 +    private class RowWrapper : Geary.BaseObject {
 +        public Geary.App.Conversation conversation;
 +        public Gtk.TreeRowReference row;
 +        
 +        public RowWrapper(Gtk.TreeModel model, Geary.App.Conversation conversation, Gtk.TreePath path) {
 +            this.conversation = conversation;
 +            this.row = new Gtk.TreeRowReference(model, path);
 +        }
 +        
 +        public Gtk.TreePath get_path() {
 +            return row.get_path();
 +        }
 +        
 +        public Gtk.TreeIter get_iter() {
 +            Gtk.TreeIter iter;
 +            bool valid = row.get_model().get_iter(out iter, get_path());
 +            assert(valid);
 +            
 +            return iter;
 +        }
 +    }
 +    
      public Geary.ProgressMonitor preview_monitor { get; private set; default = 
          new Geary.SimpleProgressMonitor(Geary.ProgressType.ACTIVITY); }
+     public bool is_clearing { get; private set; default = false; }
      
      private Geary.App.ConversationMonitor conversation_monitor;
 -    private Geary.Folder? current_folder = null;
 +    private Gee.HashMap<Geary.App.Conversation, RowWrapper> row_map = new Gee.HashMap<
 +        Geary.App.Conversation, RowWrapper>();
      private Geary.App.EmailStore? email_store = null;
 -    private Cancellable? cancellable_folder = null;
 +    private Cancellable cancellable = new Cancellable();
      private bool loading_local_only = true;
      private Geary.Nonblocking.Mutex refresh_mutex = new Geary.Nonblocking.Mutex();
      private uint update_id = 0;
@@@ -140,8 -96,16 +143,10 @@@
              conversation_monitor.conversation_trimmed.connect(on_conversation_trimmed);
              conversation_monitor.email_flags_changed.connect(on_email_flags_changed);
          }
+         
+         is_clearing = false;
      }
      
 -    public void set_current_folder(Geary.Folder? current_folder, Cancellable? cancellable_folder) {
 -        this.current_folder = current_folder;
 -        this.cancellable_folder = cancellable_folder;
 -        email_store = (current_folder == null ? null : new Geary.App.EmailStore(current_folder.account));
 -    }
 -    
      public Geary.App.Conversation? get_conversation_at_path(Gtk.TreePath path) {
          Gtk.TreeIter iter;
          if (!get_iter(out iter, path))