[meld] ui.statusbar, filediff.ui: Fix some statusbar styling and packing

[Kai Willadsen <kaiw src gnome org>]

commit e9672cab01d1f64cc1e5ca6ffc99691f9c5754bc
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jan 25 10:15:03 2014 +1000

    ui.statusbar, filediff.ui: Fix some statusbar styling and packing

 data/ui/filediff.ui  |   22 +++++++++++-----------
 meld/ui/statusbar.py |    4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index fa42aec..d202074 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -507,17 +507,6 @@
                 <property name="height">1</property>
               </packing>
             </child>
-            <child>
-              <object class="MeldStatusBar" id="statusbar">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">7</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -525,6 +514,17 @@
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <object class="MeldStatusBar" id="statusbar">
+            <property name="visible">True</property>
+            <property name="margin-right">12</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>
diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py
index b4c742d..160410f 100644
--- a/meld/ui/statusbar.py
+++ b/meld/ui/statusbar.py
@@ -42,7 +42,7 @@ class MeldStatusBar(Gtk.Statusbar):
         hbox.pack_start(label, True, True, 0)
 
         alignment = Gtk.Alignment.new(xalign=1.0, yalign=0.5, xscale=1.0, yscale=1.0)
-        self.info_box = Gtk.HBox(False, 6)
+        self.info_box = Gtk.HBox(False, 12)
         self.info_box.show()
         alignment.add(self.info_box)
         self.pack_start(alignment, True, True, 0)
@@ -52,4 +52,4 @@ class MeldStatusBar(Gtk.Statusbar):
         for child in self.info_box.get_children():
             self.info_box.remove(child)
         for widget in widgets:
-            self.info_box.pack_end(widget, True, True, 0)
+            self.info_box.pack_end(widget, False, True, 0)