[gitg] Put spinner near to checkbox for commit display margin option

[Ignacio Casal Quinteiro <icq src gnome org>]

commit b6691c3e3acce08dd418b2496e94a9685bb6e2e9
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Jul 6 19:24:41 2013 +0200

    Put spinner near to checkbox for commit display margin option

 gitg/resources/ui/gitg-preferences-commit.ui |   48 +++++--------------------
 1 files changed, 10 insertions(+), 38 deletions(-)
---
diff --git a/gitg/resources/ui/gitg-preferences-commit.ui b/gitg/resources/ui/gitg-preferences-commit.ui
index bfc9d19..1a7ae21 100644
--- a/gitg/resources/ui/gitg-preferences-commit.ui
+++ b/gitg/resources/ui/gitg-preferences-commit.ui
@@ -63,10 +63,10 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="check_button_show_right_margin">
-                    <property name="label" translatable="yes">Display right _margin</property>
+                    <property name="label" translatable="yes">Display right _margin at column:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -83,45 +83,17 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="grid5">
+                  <object class="GtkSpinButton" id="spin_button_right_margin">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_right_margin">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Right margin at column:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="spin_button_right_margin">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="adjustment">spin_button_right_margin_adjustment</property>
-                        <property name="climb_rate">1</property>
-                        <property name="snap_to_ticks">True</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="adjustment">spin_button_right_margin_adjustment</property>
+                    <property name="climb_rate">1</property>
+                    <property name="snap_to_ticks">True</property>
+                    <property name="numeric">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>