[geary/wip/unread-status-714865: 7/7] Merge branch 'master' into wip/unread-status-714865

[Charles Lindsay <clindsay src gnome org>]

commit f61298561771d72042c106ff801cd0ff21340908
Merge: b4daa66 7e1e968
Author: Charles Lindsay <chaz yorba org>
Date:   Tue Feb 25 12:08:02 2014 -0800

    Merge branch 'master' into wip/unread-status-714865
    
    Conflicts:
        src/engine/imap-engine/imap-engine-minimal-folder.vala

 help/Makefile.am                                   |    2 +-
 help/el/el.po                                      |  914 ++++++++++++++++++++
 src/client/components/icon-factory.vala            |   21 +
 src/client/composer/composer-window.vala           |   23 +-
 .../conversation-viewer/conversation-web-view.vala |    5 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |   93 ++-
 .../replay-ops/imap-engine-replay-removal.vala     |   11 +-
 src/engine/rfc822/rfc822-utils.vala                |    4 +-
 ui/composer.glade                                  |   18 +-
 9 files changed, 1051 insertions(+), 40 deletions(-)
---
diff --cc src/engine/imap-engine/imap-engine-minimal-folder.vala
index 8d77123,2c65acd..846ddf1
--- a/src/engine/imap-engine/imap-engine-minimal-folder.vala
+++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala
@@@ -512,13 -512,14 +512,14 @@@ private class Geary.ImapEngine.MinimalF
          if (open_count == 0)
              return;
          
+         Imap.Folder? opening_folder = null;
          try {
              debug("Fetching information for remote folder %s", to_string());
-             Imap.Folder folder = yield remote.fetch_folder_async(local_folder.get_path(),
+             opening_folder = yield remote.fetch_folder_async(local_folder.get_path(),
 -                cancellable);
 +                null, cancellable);
              
-             debug("Opening remote folder %s", folder.to_string());
-             yield folder.open_async(cancellable);
+             debug("Opening remote folder %s", opening_folder.to_string());
+             yield opening_folder.open_async(cancellable);
              
              // allow subclasses to examine the opened folder and resolve any vital
              // inconsistencies