[meld] dirdiff/filediff: Set expand in UI file instead

[Kai Willadsen <kaiw src gnome org>]

commit 9b27c2fd4da0cb2ffee83055b16f3bed3ff88a03
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Feb 8 06:44:39 2014 +1000

    dirdiff/filediff: Set expand in UI file instead

 data/ui/dirdiff.ui  |    9 +++++++++
 data/ui/filediff.ui |    9 +++++++++
 meld/dirdiff.py     |    5 +----
 meld/filediff.py    |    5 +----
 4 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/data/ui/dirdiff.ui b/data/ui/dirdiff.ui
index c5d229b..9a24fed 100644
--- a/data/ui/dirdiff.ui
+++ b/data/ui/dirdiff.ui
@@ -129,6 +129,9 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -162,6 +165,9 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -195,6 +201,9 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index 4805686..ad251ac 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -178,6 +178,9 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -227,6 +230,9 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -276,6 +282,9 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 4705bc2..da56f9e 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -324,10 +324,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
         self.map_widgets_into_lists(["treeview", "fileentry", "scrolledwindow",
                                      "diffmap", "linkmap", "msgarea_mgr",
                                      "vbox", "dummy_toolbar_linkmap",
-                                     "file_toolbar", "fileentry_toolitem"])
-
-        for toolitem in self.fileentry_toolitem:
-            toolitem.set_expand(True)
+                                     "file_toolbar"])
 
         self.widget.ensure_style()
         self.on_style_updated(self.widget)
diff --git a/meld/filediff.py b/meld/filediff.py
index 9e704b8..616b89d 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -171,7 +171,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         gnomeglade.Component.__init__(self, "filediff.ui", "filediff")
         widget_lists = [
             "diffmap", "file_save_button", "file_toolbar", "fileentry",
-            "fileentry_toolitem", "linkmap", "msgarea_mgr", "readonlytoggle",
+            "linkmap", "msgarea_mgr", "readonlytoggle",
             "scrolledwindow", "selector_hbox", "textview", "vbox",
             "dummy_toolbar_linkmap"
         ]
@@ -228,9 +228,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             buf.connect("notify::has-selection",
                         self.update_text_actions_sensitivity)
 
-        for toolitem in self.fileentry_toolitem:
-            toolitem.set_expand(True)
-
         actions = (
             ("MakePatch", None, _("Format as Patch..."), None,
                 _("Create a patch using differences between files"),