[geary: 2/3] Merge branch 'mainline' into 'header-group'

[Michael Gratton <mjog src gnome org>]

commit 2cf110eb20cd81017b360422a2e83c9e98b6281a
Merge: 7d207dbb 411a7198
Author: Michael Gratton <mike vee net>
Date:   Thu Jan 23 11:34:40 2020 +0000

    Merge branch 'mainline' into 'header-group'
    
    # Conflicts:
    #   src/client/components/main-toolbar.vala

 desktop/org.gnome.Geary.gschema.xml                |  13 +
 icons/font-color-symbolic.svg                      |  19 +
 icons/font-size-symbolic.svg                       |  19 +
 icons/meson.build                                  |   2 +
 src/client/accounts/accounts-editor-list-pane.vala |   6 +-
 src/client/application/application-command.vala    |   8 +
 .../application/application-configuration.vala     |  11 +
 src/client/application/application-controller.vala |  18 +-
 .../application/application-main-window.vala       |  12 +-
 .../components/components-in-app-notification.vala |  14 +-
 src/client/components/components-reflow-box.c      | 495 ++++++++++
 src/client/components/main-toolbar.vala            |   4 -
 src/client/composer/composer-headerbar.vala        |   9 -
 src/client/composer/composer-web-view.vala         |  11 +-
 src/client/composer/composer-widget.vala           | 209 +++--
 src/client/composer/spell-check-popover.vala       |   3 +-
 src/client/meson.build                             |   1 +
 src/client/util/util-gtk.vala                      |   9 +
 test/client/composer/composer-web-view-test.vala   |  19 +-
 test/js/composer-page-state-test.vala              |   6 +-
 ui/composer-headerbar.ui                           |  84 +-
 ui/composer-link-popover.ui                        |   2 +-
 ui/composer-menus.ui                               |  58 --
 ui/composer-web-view.js                            |   9 +-
 ui/composer-widget.ui                              | 992 +++++++++++++--------
 ui/geary.css                                       |   9 -
 ui/main-toolbar.ui                                 |  12 +-
 27 files changed, 1427 insertions(+), 627 deletions(-)
---
diff --cc src/client/components/main-toolbar.vala
index 57a87b00,e4b55743..2a160f8b
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@@ -95,17 -102,16 +95,13 @@@ public class MainToolbar : Gtk.Box 
  
      public void set_conversation_header(Gtk.HeaderBar header) {
          conversation_header.hide();
-         header.get_style_context().add_class("geary-titlebar");
-         header.get_style_context().add_class("geary-titlebar-right");
 -        guest_header_binding = bind_property("show-close-button-right", header,
 -            "show-close-button", BindingFlags.SYNC_CREATE);
 +        this.header_group.add_header_bar(header);
          pack_start(header, true, true);
 -        header.decoration_layout = conversation_header.decoration_layout;
      }
  
      public void remove_conversation_header(Gtk.HeaderBar header) {
          remove(header);
-         header.get_style_context().remove_class("geary-titlebar");
-         header.get_style_context().remove_class("geary-titlebar-right");
 -        guest_header_binding.unbind();
 -        header.decoration_layout = Gtk.Settings.get_default().gtk_decoration_layout;
 +        this.header_group.remove_header_bar(header);
          conversation_header.show();
      }