[geary/wip/714217-offline: 13/13] Merge branch 'master' into wip/714217-offline

[Jim Nelson <jnelson src gnome org>]

commit 15e78dda0d1e3b0372e6baca5f36de7649381e9d
Merge: 24c6711 7abfb64
Author: Jim Nelson <jim yorba org>
Date:   Thu Dec 12 17:37:51 2013 -0800

    Merge branch 'master' into wip/714217-offline

 CMakeLists.txt                                     |    3 +-
 NEWS                                               |    7 +
 README                                             |    2 +-
 THANKS                                             |    2 +
 .../metadata/webkitgtk-1.10/WebKit-3.0.metadata    |   16 ++
 .../metadata/webkitgtk-2.0/WebKit-3.0.metadata     |    3 +
 configure                                          |    6 +
 debian/changelog                                   |    7 +
 debian/control                                     |    2 -
 po/it.po                                           |   15 +-
 src/CMakeLists.txt                                 |   27 ++-
 src/client/application/geary-action-adapter.vala   |   67 +++++++
 src/client/application/geary-application.vala      |  190 +++++++++++++++-----
 src/client/application/geary-config.vala           |    4 +-
 src/client/application/geary-controller.vala       |   83 +++++++---
 src/client/components/main-toolbar.vala            |   10 +-
 src/client/components/main-window.vala             |    6 +-
 .../formatted-conversation-data.vala               |    5 +-
 src/client/notification/libnotify.vala             |    2 +-
 src/client/util/util-yorba-application.vala        |  189 -------------------
 src/engine/api/geary-named-flags.vala              |   29 +---
 src/engine/api/geary-search-folder.vala            |   56 +++----
 src/engine/app/app-conversation-monitor.vala       |   25 +--
 .../conversation-monitor/app-conversation-set.vala |   12 +-
 src/engine/imap-db/imap-db-folder.vala             |   10 +-
 .../imap-engine/imap-engine-generic-account.vala   |   41 ++---
 src/engine/imap/message/imap-flags.vala            |    7 +-
 src/engine/util/util-iterable.vala                 |  141 +++++++++++++++
 ui/CMakeLists.txt                                  |    1 +
 ui/app_menu.interface                              |   40 ++++
 30 files changed, 610 insertions(+), 398 deletions(-)
---