[geary/wip/765516-gtk-widget-conversation-viewer: 193/207] Make composer scrolled window directly available to the embedded container.

[Michael Gratton <mjog src gnome org>]

commit 72d97c72f738f04d750f8b5c52add3f3551db313
Author: Michael James Gratton <mike vee net>
Date:   Mon Sep 19 16:37:35 2016 +1000

    Make composer scrolled window directly available to the embedded container.

 src/client/composer/composer-embed.vala  |    6 ++----
 src/client/composer/composer-widget.vala |    5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/client/composer/composer-embed.vala b/src/client/composer/composer-embed.vala
index 7a698ed..e949b3e 100644
--- a/src/client/composer/composer-embed.vala
+++ b/src/client/composer/composer-embed.vala
@@ -57,8 +57,7 @@ public class ComposerEmbed : Gtk.EventBox, ComposerContainer {
     private void on_realize() {
         update_style();
 
-        Gtk.ScrolledWindow win = (Gtk.ScrolledWindow) this.composer.editor.parent;
-        win.get_vscrollbar().hide();
+        this.composer.editor_scrolled.get_vscrollbar().hide();
 
         this.composer.editor.vadjustment.value_changed.connect(on_inner_scroll);
         this.composer.editor.vadjustment.changed.connect(on_adjust_changed);
@@ -122,8 +121,7 @@ public class ComposerEmbed : Gtk.EventBox, ComposerContainer {
         this.composer.editor.vadjustment.value_changed.disconnect(on_inner_scroll);
         this.composer.editor.user_changed_contents.disconnect(on_inner_size_changed);
         disable_scroll_reroute(this);
-        Gtk.ScrolledWindow win = (Gtk.ScrolledWindow) composer.editor.parent;
-        win.get_vscrollbar().show();
+        this.composer.editor_scrolled.get_vscrollbar().show();
 
         try {
             this.composer.editor.get_dom_document().body.get_class_list().remove("embedded");
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index abddab2..948d109 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -274,6 +274,9 @@ public class ComposerWidget : Gtk.EventBox {
 
     public string window_title { get; set; }
 
+    [GtkChild]
+    internal Gtk.ScrolledWindow editor_scrolled;
+
     private ContactListStore? contact_list_store = null;
 
     private string? body_html = null;
@@ -339,8 +342,6 @@ public class ComposerWidget : Gtk.EventBox {
     private Gtk.Label info_label;
     [GtkChild]
     private Gtk.Box message_area;
-    [GtkChild]
-    private Gtk.ScrolledWindow editor_scrolled;
 
     private Menu html_menu;
     private Menu plain_menu;