[geary/wip/721828-undo-2: 17/18] Merge branch 'master' into wip/721828-undo-2

[Jim Nelson <jnelson src gnome org>]

commit 523a71468f3686cbd43c4ecc5677558306cf1ea1
Merge: 67fae47 d4cc681
Author: Jim Nelson <jim yorba org>
Date:   Mon Jan 26 17:37:52 2015 -0800

    Merge branch 'master' into wip/721828-undo-2
    
    Conflicts:
        src/client/components/main-toolbar.vala
        src/engine/api/geary-folder-supports-archive.vala
        src/engine/imap-engine/replay-ops/imap-engine-move-email.vala

 desktop/org.yorba.geary.gschema.xml                |    6 +
 po/POTFILES.in                                     |   26 +-
 po/de.po                                           |  482 +++++++++++---------
 po/pl.po                                           |  381 +++++++++-------
 src/CMakeLists.txt                                 |    1 +
 src/client/application/geary-config.vala           |    5 +
 src/client/application/geary-controller.vala       |   44 ++-
 src/client/components/main-toolbar.vala            |   18 +-
 src/client/composer/composer-box.vala              |   74 +++
 src/client/composer/composer-container.vala        |    1 +
 src/client/composer/composer-embed.vala            |   23 +-
 src/client/composer/composer-widget.vala           |  225 ++++++++--
 src/client/composer/composer-window.vala           |    5 +
 src/client/composer/email-entry.vala               |   27 +-
 .../conversation-list/conversation-list-store.vala |    5 +
 .../conversation-list/conversation-list-view.vala  |   13 +
 .../conversation-viewer/conversation-viewer.vala   |   64 +++-
 src/client/util/util-webkit.vala                   |    2 +-
 src/engine/api/geary-folder-supports-archive.vala  |   16 +-
 src/engine/api/geary-folder-supports-copy.vala     |    1 +
 src/engine/api/geary-folder-supports-create.vala   |    3 +-
 src/engine/api/geary-folder-supports-mark.vala     |   17 +-
 src/engine/api/geary-folder-supports-move.vala     |    1 +
 src/engine/api/geary-folder-supports-remove.vala   |   14 +-
 src/engine/api/geary-folder.vala                   |    4 +
 src/engine/app/app-conversation-monitor.vala       |   27 +-
 src/engine/app/app-draft-manager.vala              |    4 +-
 src/engine/imap-db/imap-db-folder.vala             |   35 ++
 .../imap-engine-account-synchronizer.vala          |   29 +-
 .../imap-engine/imap-engine-generic-account.vala   |    4 +-
 .../imap-engine/imap-engine-generic-folder.vala    |    6 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |  358 +++++++++------
 .../imap-engine/imap-engine-replay-operation.vala  |   38 ++-
 .../imap-engine/imap-engine-replay-queue.vala      |   36 ++-
 .../imap-engine-send-replay-operation.vala         |    8 +-
 src/engine/imap-engine/imap-engine.vala            |   19 +
 .../imap-engine-abstract-list-email.vala           |    2 +-
 .../replay-ops/imap-engine-copy-email.vala         |    2 +-
 .../replay-ops/imap-engine-create-email.vala       |   23 +-
 .../replay-ops/imap-engine-empty-folder.vala       |    2 +-
 .../replay-ops/imap-engine-fetch-email.vala        |    3 +-
 .../replay-ops/imap-engine-mark-email.vala         |    8 +-
 .../replay-ops/imap-engine-move-email.vala         |   36 +-
 .../replay-ops/imap-engine-remove-email.vala       |    5 +-
 .../replay-ops/imap-engine-replay-append.vala      |   10 +-
 .../replay-ops/imap-engine-replay-disconnect.vala  |   18 +-
 .../replay-ops/imap-engine-replay-removal.vala     |    9 +-
 .../imap-engine-server-search-email.vala           |    3 +
 src/engine/imap/api/imap-account.vala              |   17 +-
 src/engine/imap/api/imap-folder.vala               |   17 +-
 src/engine/imap/command/imap-store-command.vala    |   20 +-
 src/engine/imap/imap-error.vala                    |    4 +
 .../imap/transport/imap-client-connection.vala     |   21 +-
 .../transport/imap-client-session-manager.vala     |  125 +++++-
 .../nonblocking-abstract-semaphore.vala            |   12 -
 src/engine/nonblocking/nonblocking-mailbox.vala    |    3 +-
 .../nonblocking-reporting-semaphore.vala           |    4 +-
 src/engine/rfc822/rfc822-message-data.vala         |    4 +-
 src/engine/rfc822/rfc822-utils.vala                |   54 ++-
 theming/message-viewer.html                        |    1 +
 60 files changed, 1610 insertions(+), 815 deletions(-)
---
diff --cc src/client/components/main-toolbar.vala
index 39c52a8,79b3555..2250d3b
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@@ -64,18 -70,8 +70,12 @@@ public class MainToolbar : PillHeaderba
          insert.clear();
          insert.add(archive_button = create_toolbar_button(null, GearyController.ACTION_ARCHIVE_MESSAGE, 
true));
          insert.add(trash_delete_button = create_toolbar_button(null, GearyController.ACTION_TRASH_MESSAGE, 
false));
-         insert.add(create_menu_button(null, empty_menu, GearyController.ACTION_EMPTY_MENU));
-         Gtk.Box archive_trash_delete_empty = create_pill_buttons(insert);
+         Gtk.Box archive_trash_delete = create_pill_buttons(insert);
          
 +        insert.clear();
 +        insert.add(create_toolbar_button(null, GearyController.ACTION_UNDO, false));
 +        Gtk.Box undo = create_pill_buttons(insert);
 +        
          // Search bar.
          search_entry.width_chars = 28;
          search_entry.tooltip_text = _("Search all mail in account for keywords (Ctrl+S)");
@@@ -91,8 -87,7 +91,8 @@@
          
          // pack_end() ordering is reversed in GtkHeaderBar in 3.12 and above
  #if !GTK_3_12
-         add_end(archive_trash_delete_empty);
+         add_end(archive_trash_delete);
 +        add_end(undo);
          add_end(search_upgrade_progress_bar);
          add_end(search_entry);
  #endif
@@@ -108,8 -103,7 +108,8 @@@
  #if GTK_3_12
          add_end(search_entry);
          add_end(search_upgrade_progress_bar);
 +        add_end(undo);
-         add_end(archive_trash_delete_empty);
+         add_end(archive_trash_delete);
  #endif
          
          set_search_placeholder_text(DEFAULT_SEARCH_TEXT);
diff --cc src/engine/api/geary-folder-supports-archive.vala
index 73ce06d,02bcde8..a57d8d1
--- a/src/engine/api/geary-folder-supports-archive.vala
+++ b/src/engine/api/geary-folder-supports-archive.vala
@@@ -18,25 -19,8 +19,10 @@@ public interface Geary.FolderSupport.Ar
       * Archives the specified emails from the folder.
       *
       * The { link Geary.Folder} must be opened prior to attempting this operation.
 +     *
 +     * @returns A { link Geary.Revokable} that may be used to revoke (undo) this operation later.
       */
 -    public abstract async void archive_email_async(Gee.List<Geary.EmailIdentifier> email_ids,
 +    public abstract async Geary.Revokable? archive_email_async(Gee.List<Geary.EmailIdentifier> email_ids,
          Cancellable? cancellable = null) throws Error;
-     
-     /**
-      * Archive one email from the folder.
-      *
-      * The { link Geary.Folder} must be opened prior to attempting this operation.
-      *
-      * @returns A { link Geary.Revokable} that may be used to revoke (undo) this operation later.
-      */
-     public virtual async Geary.Revokable? archive_single_email_async(Geary.EmailIdentifier email_id,
-         Cancellable? cancellable = null) throws Error {
-         Gee.ArrayList<Geary.EmailIdentifier> ids = new Gee.ArrayList<Geary.EmailIdentifier>();
-         ids.add(email_id);
-         
-         return yield archive_email_async(ids, cancellable);
-     }
  }