[geary/wip/730682-refine-convo-list: 5/12] Set the conversation list's scrolled window policy in the builder file.

[Michael Gratton <mjog src gnome org>]

commit c2f09f07df559eac9d2ee57acb1023d367b0dfbb
Author: Michael James Gratton <mike vee net>
Date:   Sat Oct 14 17:08:48 2017 +1100

    Set the conversation list's scrolled window policy in the builder file.

 src/client/components/main-window.vala |    4 --
 ui/main-window.ui                      |   61 +++++++++++++++----------------
 2 files changed, 30 insertions(+), 35 deletions(-)
---
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index d283271..ad5b52e 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -194,10 +194,6 @@ public class MainWindow : Gtk.ApplicationWindow {
         // Folder list
         this.folder_list_scrolled.add(this.folder_list);
         // Conversation list
-        this.conversation_list_scrolled.set_policy(
-            Gtk.PolicyType.NEVER,
-            Gtk.PolicyType.AUTOMATIC
-        );
         this.conversation_list_scrolled.add(this.conversation_list);
         // Conversation viewer
         this.conversations_paned.pack2(this.conversation_viewer, true, true);
diff --git a/ui/main-window.ui b/ui/main-window.ui
index 1ed5894..dd2d234 100644
--- a/ui/main-window.ui
+++ b/ui/main-window.ui
@@ -1,69 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.20"/>
   <template class="MainWindow" parent="GtkApplicationWindow">
-    <property name="visible">False</property>
-    <property name="show_menubar">False</property>
     <property name="name">GearyMainWindow</property>
+    <property name="can_focus">False</property>
     <property name="events">GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | 
GDK_STRUCTURE_MASK</property>
-    <signal name="delete_event" handler="on_delete_event"/>
-    <signal name="key_release_event" handler="on_key_release_event"/>
-    <signal name="focus_in_event" handler="on_focus_event"/>
+    <property name="show_menubar">False</property>
+    <signal name="delete-event" handler="on_delete_event" swapped="no"/>
+    <signal name="focus-in-event" handler="on_focus_event" swapped="no"/>
+    <signal name="key-release-event" handler="on_key_release_event" swapped="no"/>
     <child>
       <object class="GtkBox" id="main_layout">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">0</property>
         <child>
           <object class="GtkPaned" id="conversations_paned">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">horizontal</property>
             <child>
               <object class="GtkBox" id="search_bar_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">0</property>
-                <style>
-                  <class name="sidebar"/>
-                </style>
                 <child>
                   <object class="GtkPaned" id="folder_paned">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
-                    <style>
-                      <class name="geary-sidebar-pane-separator"/>
-                    </style>
                     <child>
                       <object class="GtkBox" id="folder_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkFrame" id="folder_frame">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
                             <property name="shadow_type">in</property>
-                            <style>
-                              <class name="geary-folder-frame"/>
-                            </style>
                             <child>
                               <object class="GtkScrolledWindow" id="folder_list_scrolled">
+                                <property name="width_request">100</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="width_request">100</property>
                                 <property name="hscrollbar_policy">never</property>
-                                <property name="vscrollbar_policy">automatic</property>
                               </object>
                             </child>
+                            <style>
+                              <class name="geary-folder-frame"/>
+                            </style>
                           </object>
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                       </object>
@@ -77,28 +68,28 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkFrame" id="conversation_frame">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
                             <property name="shadow_type">in</property>
-                            <style>
-                              <class name="geary-conversation-frame"/>
-                            </style>
                             <child>
                               <object class="GtkScrolledWindow" id="conversation_list_scrolled">
+                                <property name="width_request">250</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="width_request">250</property>
-                                <property name="hscrollbar_policy">automatic</property>
-                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="hscrollbar_policy">never</property>
                               </object>
                             </child>
+                            <style>
+                              <class name="geary-conversation-frame"/>
+                            </style>
                           </object>
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                       </object>
@@ -107,13 +98,20 @@
                         <property name="shrink">False</property>
                       </packing>
                     </child>
+                    <style>
+                      <class name="geary-sidebar-pane-separator"/>
+                    </style>
                   </object>
                   <packing>
-                    <property name="pack_type">end</property>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
+                <style>
+                  <class name="sidebar"/>
+                </style>
               </object>
               <packing>
                 <property name="resize">False</property>
@@ -122,9 +120,10 @@
             </child>
           </object>
           <packing>
-            <property name="pack_type">end</property>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>