[totem] backend: Unlink the Go and Volume buttons

[Bastien Nocera <hadess src gnome org>]

commit a64b95e1c9f425596970592a6f7ea1b26d2dbce4
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jan 20 20:45:07 2014 +0100

    backend: Unlink the Go and Volume buttons
    
    As advised by Jakub Steiner.

 data/controls.ui |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/data/controls.ui b/data/controls.ui
index a452159..87dfe61 100644
--- a/data/controls.ui
+++ b/data/controls.ui
@@ -89,15 +89,19 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkBox" id="box1">
+              <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkMenuButton" id="go_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="relief">none</property>
+                    <style>
+                      <class name="image-button"/>
+                    </style>
                     <child>
                       <object class="GtkImage" id="go_button_image">
                         <property name="visible">True</property>
@@ -107,11 +111,28 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolItem" id="volume_toolbutton">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkBox" id="box1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkVolumeButton" id="volume_button">
                     <property name="visible">True</property>
@@ -127,23 +148,14 @@ audio-volume-high-symbolic
 audio-volume-low-symbolic
 audio-volume-medium-symbolic</property>
                     <property name="use_symbolic">True</property>
-                    <child internal-child="plus_button">
-                      <object class="GtkButton" id="volumebutton-plus_button">
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                      </object>
-                    </child>
-                    <child internal-child="minus_button">
-                      <object class="GtkButton" id="volumebutton-minus_button">
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                      </object>
-                    </child>
+                    <style>
+                      <class name="image-button"/>
+                    </style>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>