[geary/gtk-3.10: 18/18] Merge branch 'master' into gtk-3.10

[Jim Nelson <jnelson src gnome org>]

commit 3b8074a0f5ab5d21563a0161d5fb3ebda3f9f2d6
Merge: 9134111 6d7489e
Author: Jim Nelson <jim yorba org>
Date:   Tue Feb 4 11:55:58 2014 -0800

    Merge branch 'master' into gtk-3.10
    
    Conflicts:
        src/client/components/pill-toolbar.vala

 CMakeLists.txt                                     |    2 +-
 NEWS                                               |   11 +
 po/POTFILES.in                                     |    3 +-
 po/es.po                                           |  417 ++++++++++----------
 po/he.po                                           |  235 +++++++-----
 po/pl.po                                           |  292 ++++++++------
 sql/CMakeLists.txt                                 |    1 +
 sql/version-017.sql                                |    7 +
 src/CMakeLists.txt                                 |    4 +-
 src/client/accounts/add-edit-page.vala             |   16 +
 src/client/application/geary-controller.vala       |   29 ++-
 src/client/components/icon-factory.vala            |   50 ---
 src/client/components/status-bar.vala              |    9 +-
 src/client/composer/composer-window.vala           |    2 +-
 .../conversation-list/conversation-list-view.vala  |    2 +-
 .../formatted-conversation-data.vala               |   11 +-
 .../conversation-viewer/conversation-viewer.vala   |   24 +-
 src/console/main.vala                              |    2 +-
 src/engine/abstract/geary-abstract-account.vala    |    8 +-
 src/engine/api/geary-account-information.vala      |   31 ++
 src/engine/api/geary-account.vala                  |    1 +
 src/engine/api/geary-email-flags.vala              |   11 +
 src/engine/api/geary-named-flags.vala              |    4 +-
 src/engine/app/app-email-store.vala                |    2 +-
 .../app/email-store/app-fetch-operation.vala       |    2 +-
 src/engine/imap-db/imap-db-folder.vala             |    4 +-
 src/engine/imap-db/outbox/smtp-outbox-folder.vala  |  153 ++++++--
 .../imap-engine-account-synchronizer.vala          |    6 -
 .../imap-engine/imap-engine-generic-account.vala   |    8 +-
 .../imap-engine/imap-engine-generic-folder.vala    |   64 ++--
 .../imap-engine-generic-sent-mail-folder.vala      |   10 +-
 .../imap-engine-receive-replay-operation.vala      |   22 -
 .../replay-ops/imap-engine-create-email.vala       |    2 +-
 .../replay-ops/imap-engine-fetch-email.vala        |    7 +-
 .../replay-ops/imap-engine-replay-append.vala      |   13 +-
 .../replay-ops/imap-engine-replay-disconnect.vala  |   15 +-
 .../replay-ops/imap-engine-replay-removal.vala     |   12 +-
 src/engine/imap/api/imap-account.vala              |   13 +-
 src/engine/imap/api/imap-folder.vala               |   10 +-
 src/engine/imap/command/imap-list-command.vala     |   15 +-
 .../imap/command/imap-list-return-parameter.vala   |   36 ++
 src/engine/imap/message/imap-tag.vala              |    2 +-
 src/engine/imap/response/imap-capabilities.vala    |   10 +
 .../imap/transport/imap-client-connection.vala     |   41 ++-
 src/engine/memory/memory-offset-buffer.vala        |   47 +++
 src/engine/rfc822/rfc822-message.vala              |   91 ++---
 src/engine/util/util-iterable.vala                 |   16 +
 src/engine/util/util-single-item.vala              |   90 -----
 src/mailer/main.vala                               |   53 ++-
 theming/message-viewer.css                         |    9 +
 theming/message-viewer.html                        |    1 +
 ui/login.glade                                     |   21 +
 52 files changed, 1143 insertions(+), 804 deletions(-)
---