[totem/gnome-3-20] screenshot: Fix expanded spin buttons

[Bastien Nocera <hadess src gnome org>]

commit 2b85ea6bd633e1f9c06eaa6c1b53af9b1edacce8
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jun 24 18:06:49 2016 +0200

    screenshot: Fix expanded spin buttons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767410

 src/plugins/screenshot/gallery.ui |   36 ++++++++++++------------------------
 1 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/src/plugins/screenshot/gallery.ui b/src/plugins/screenshot/gallery.ui
index 534f6ea..793d4ed 100644
--- a/src/plugins/screenshot/gallery.ui
+++ b/src/plugins/screenshot/gallery.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <interface>
+       <requires lib="gtk+" version="3.20"/>
        <object class="GtkAdjustment" id="screenshot_count_adjustment">
                <property name="upper">30</property>
                <property name="lower">1</property>
@@ -16,13 +17,13 @@
                <property name="page-size">0</property>
                <property name="value">128</property>
        </object>
-       <object class="GtkVBox" id="gallery_dialog_content">
-               <property name="spacing">2</property>
+       <object class="GtkBox" id="gallery_dialog_content">
+               <property name="orientation">vertical</property>
+               <property name="border-width">12</property>
                <child>
-                       <object class="GtkTable" id="table1">
-                               <property name="n-rows">4</property>
-                               <property name="n-columns">2</property>
-                               <property name="row-spacing">5</property>
+                       <object class="GtkGrid" id="table1">
+                               <property name="row-spacing">8</property>
+                               <property name="column-spacing">12</property>
                                <child>
                                        <object class="GtkSpinButton" id="screenshot_count">
                                                <property name="sensitive">False</property><!-- made 
sensitive when default_screenshot_count is unchecked -->
@@ -31,9 +32,7 @@
                                        </object>
                                        <packing>
                                                <property name="left-attach">1</property>
-                                               <property name="right-attach">2</property>
                                                <property name="top-attach">3</property>
-                                               <property name="bottom-attach">4</property>
                                        </packing>
                                </child>
                                <child>
@@ -42,12 +41,8 @@
                                                <property name="label" translatable="yes">Screenshot width 
(in pixels):</property>
                                        </object>
                                        <packing>
+                                               <property name="left-attach">0</property>
                                                <property name="top-attach">1</property>
-                                               <property name="bottom-attach">2</property>
-                                               <property name="x-options">GTK_FILL</property>
-                                               <property name="y-options">GTK_FILL</property>
-                                               <property name="x-padding">5</property>
-                                               <property name="y-padding">5</property>
                                        </packing>
                                </child>
                                <child>
@@ -58,11 +53,9 @@
                                                <signal name="toggled" 
handler="default_screenshot_count_toggled_callback"/>
                                        </object>
                                        <packing>
-                                               <property name="right-attach">2</property>
+                                               <property name="left-attach">0</property>
+                                               <property name="width">2</property>
                                                <property name="top-attach">2</property>
-                                               <property name="bottom-attach">3</property>
-                                               <property name="y-options">GTK_FILL</property>
-                                               <property name="y-padding">5</property>
                                        </packing>
                                </child>
                                <child>
@@ -72,9 +65,7 @@
                                        </object>
                                        <packing>
                                                <property name="left-attach">1</property>
-                                               <property name="right-attach">2</property>
                                                <property name="top-attach">1</property>
-                                               <property name="bottom-attach">2</property>
                                        </packing>
                                </child>
                                <child>
@@ -83,17 +74,14 @@
                                                <property name="label" translatable="yes">Number of 
screenshots:</property>
                                        </object>
                                        <packing>
+                                               <property name="left-attach">0</property>
                                                <property name="top-attach">3</property>
-                                               <property name="bottom-attach">4</property>
-                                               <property name="x-options">GTK_FILL</property>
-                                               <property name="y-options">GTK_FILL</property>
-                                               <property name="x-padding">5</property>
-                                               <property name="y-padding">5</property>
                                        </packing>
                                </child>
                        </object>
                        <packing>
                                <property name="padding">5</property>
+                               <property name="pack_type">end</property>
                        </packing>
                </child>
        </object>