[Xfce4-commits] <parole:ochosi/audiobox> Merge branch 'ochosi/audiobox' of ssh://git.xfce.org/apps/parole into ochosi/audiobox

[Sean Davis]

Updating branch refs/heads/ochosi/audiobox
         to 2bd2c9e94600c71db98f225881373d0530573783 (commit)
       from eb54a7a10574f2539cebc53270dd3c79f773e9b4 (commit)

commit 2bd2c9e94600c71db98f225881373d0530573783
Merge: eb54a7a 5d9f13a
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Nov 28 22:11:20 2012 -0500

    Merge branch 'ochosi/audiobox' of ssh://git.xfce.org/apps/parole into ochosi/audiobox

commit 5d9f13a87bd7f545f026b5f6ac889c5d6c00a65f
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Nov 29 02:19:49 2012 +0100

    Simplify audiobox packing by dropping alignments and boxes

 data/interfaces/parole.ui |   71 +++-----------------------------------------
 1 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 6504835..7498539 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -463,9 +463,9 @@
                         <property name="use_underline">True</property>
                         <property name="image">image11</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="KP_Add" signal="activate"/>
-                        <accelerator key="equal" signal="activate"/>
                         <accelerator key="plus" signal="activate"/>
+                        <accelerator key="equal" signal="activate"/>
+                        <accelerator key="KP_Add" signal="activate"/>
                         <signal name="activate" handler="parole_player_volume_up" swapped="no"/>
                       </object>
                     </child>
@@ -478,8 +478,8 @@
                         <property name="use_underline">True</property>
                         <property name="image">image10</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="minus" signal="activate"/>
                         <accelerator key="KP_Subtract" signal="activate"/>
+                        <accelerator key="minus" signal="activate"/>
                         <signal name="activate" handler="parole_player_volume_down" swapped="no"/>
                       </object>
                     </child>
@@ -697,34 +697,6 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <child>
-                                              <placeholder/>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox2">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment3">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <placeholder/>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
                                               <object class="GtkHBox" id="hbox2">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
@@ -799,45 +771,12 @@
                                                   </packing>
                                                 </child>
                                               </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkAlignment" id="alignment5">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <placeholder/>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">2</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment4">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <child>
-                                              <placeholder/>
                                             </child>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">2</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                       </object>