[geary] (13 commits) ...Merge branch 'buzzert/deleted_flags' into 'master'

[Michael Gratton <mjog src gnome org>]

Summary of changes:

  5ae6500... Filters messages from the conversation set who contain the 
  022a0b0... Fixes broken tests and adds new test
  153513a... Correct unnecessary whitespace changes
  69877b3... Conversation should be removed after flags_changed if conve
  3e1efb4... Moves flag change handling from list-store to conversation-
  61f122c... Ensure conversation set actually contains conversation befo
  15c5185... Fixes for conversations that are resurrected
  f172a13... Some more changes requested by Michael
  b4b377d... Also fix the new marked_as_deleted test to account for thes
  30e9e89... Merge branch 'master' into buzzert/deleted_flags
  ebd6650... Use similar logic to InsertOperation to know whether or not
  d694e84... Common case: don't add an insert operation if inserted_ids 
  3515070... Merge branch 'buzzert/deleted_flags' into 'master'