[geary/wip/only-incomplete: 34/34] Merge branch 'master' into wip/only-incomplete

[Jim Nelson <jnelson src gnome org>]

commit 988f1581bfc75b127c894ffb6f6ea96bcf3d4df1
Merge: 5a0aebc 4233f1a
Author: Jim Nelson <jim yorba org>
Date:   Tue May 20 19:01:41 2014 -0700

    Merge branch 'master' into wip/only-incomplete

 po/POTFILES.in                                     |    4 +
 src/CMakeLists.txt                                 |    5 +
 src/client/accounts/account-dialog.vala            |   16 +-
 src/client/application/geary-controller.vala       |  159 ++-
 src/client/composer/composer-container.vala        |   14 +
 src/client/composer/composer-embed.vala            |  141 ++
 src/client/composer/composer-toolbar.vala          |   18 +-
 src/client/composer/composer-widget.vala           | 1898 ++++++++++++++++++++
 src/client/composer/composer-window.vala           | 1740 +------------------
 src/client/composer/email-entry.vala               |   10 +-
 src/client/composer/scrollable-overlay.vala        |   47 +
 .../conversation-list/conversation-list-view.vala  |   30 +-
 .../conversation-viewer/conversation-viewer.vala   |   14 +-
 .../conversation-viewer/conversation-web-view.vala |    9 -
 src/client/dialogs/alert-dialog.vala               |    4 +-
 src/client/folder-list/folder-list-tree.vala       |    4 +
 src/client/sidebar/sidebar-tree.vala               |   14 +-
 src/client/util/util-random.vala                   |   15 +
 src/engine/api/geary-search-folder.vala            |    1 +
 .../imap-engine/imap-engine-minimal-folder.vala    |    3 +-
 theming/message-viewer.css                         |   24 +-
 ui/composer.glade                                  |   68 +-
 22 files changed, 2434 insertions(+), 1804 deletions(-)
---