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

[Jim Nelson <jnelson src gnome org>]

commit fb7c93bc5225ef6d3f7b2d09a02f2e6b608153cb
Merge: f0f47b7 c6f5ac9
Author: Jim Nelson <jim yorba org>
Date:   Tue May 27 14:47:19 2014 -0700

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

 desktop/geary.appdata.xml                          |   13 +-
 po/POTFILES.in                                     |    4 +
 po/es.po                                           |  209 ++-
 po/he.po                                           |  204 ++-
 po/pl.po                                           |  197 ++-
 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           | 1922 ++++++++++++++++++++
 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-folder.vala                   |    3 +-
 src/engine/api/geary-progress-monitor.vala         |   46 +
 src/engine/api/geary-search-folder.vala            |    1 +
 .../imap-engine/imap-engine-minimal-folder.vala    |   43 +-
 .../yahoo/imap-engine-yahoo-account.vala           |    2 +-
 src/engine/imap/api/imap-account.vala              |   78 +-
 src/engine/imap/api/imap-folder.vala               |   31 +-
 .../imap/message/imap-mailbox-specifier.vala       |   21 +-
 .../imap/response/imap-mailbox-information.vala    |   28 +-
 src/engine/imap/response/imap-server-data.vala     |    2 +-
 src/mailer/main.vala                               |    9 +
 theming/message-viewer.css                         |   24 +-
 ui/composer.glade                                  |   68 +-
 ui/login.glade                                     |  113 +-
 ui/preferences.glade                               |    1 +
 37 files changed, 3102 insertions(+), 2157 deletions(-)
---
diff --cc src/client/composer/composer-toolbar.vala
index ab1f475,8896e08..4699ddd
--- a/src/client/composer/composer-toolbar.vala
+++ b/src/client/composer/composer-toolbar.vala
@@@ -11,32 -11,36 +11,32 @@@ public class ComposerToolbar : PillTool
          Gee.List<Gtk.Button> insert = new Gee.ArrayList<Gtk.Button>();
          
          // Font formatting.
-         insert.add(create_toggle_button(null, ComposerWindow.ACTION_BOLD));
-         insert.add(create_toggle_button(null, ComposerWindow.ACTION_ITALIC));
-         insert.add(create_toggle_button(null, ComposerWindow.ACTION_UNDERLINE));
-         insert.add(create_toggle_button(null, ComposerWindow.ACTION_STRIKETHROUGH));
+         insert.add(create_toggle_button(null, ComposerWidget.ACTION_BOLD));
+         insert.add(create_toggle_button(null, ComposerWidget.ACTION_ITALIC));
+         insert.add(create_toggle_button(null, ComposerWidget.ACTION_UNDERLINE));
+         insert.add(create_toggle_button(null, ComposerWidget.ACTION_STRIKETHROUGH));
 -        Gtk.ToolItem font_format_item = create_pill_buttons(insert, false, true);
 -        add(font_format_item);
 +        add_start(create_pill_buttons(insert, false, true));
          
          // Indent level.
          insert.clear();
-         insert.add(create_toolbar_button(null, ComposerWindow.ACTION_INDENT));
-         insert.add(create_toolbar_button(null, ComposerWindow.ACTION_OUTDENT));
+         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_INDENT));
+         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_OUTDENT));
 -        add(create_pill_buttons(insert, false));
 +        add_start(create_pill_buttons(insert, false));
          
          // Link.
          insert.clear();
-         insert.add(create_toolbar_button(null, ComposerWindow.ACTION_INSERT_LINK));
+         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_INSERT_LINK));
 -        add(create_pill_buttons(insert));
 +        add_start(create_pill_buttons(insert));
          
          // Remove formatting.
          insert.clear();
-         insert.add(create_toolbar_button(null, ComposerWindow.ACTION_REMOVE_FORMAT));
+         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_REMOVE_FORMAT));
 -        add(create_pill_buttons(insert));
 -        
 -        // Spacer.
 -        add(create_spacer());
 +        add_start(create_pill_buttons(insert));
          
          // Menu.
          insert.clear();
-         insert.add(create_menu_button(null, menu, ComposerWindow.ACTION_MENU));
+         insert.add(create_menu_button(null, menu, ComposerWidget.ACTION_MENU));
 -        add(create_pill_buttons(insert));
 +        add_end(create_pill_buttons(insert));
      }
  }