[Xfce4-commits] <xfwm4:libxfce4ui> Fix the two other glade files.

Jérôme Guelfucci noreply at xfce.org
Sun Feb 28 12:48:09 CET 2010


Updating branch refs/heads/libxfce4ui
         to 2ffcbf4223c653f62fef73208c2683485de24e53 (commit)
       from 97a4ac3e8545e572586a8c40905c4f02cc83112e (commit)

commit 2ffcbf4223c653f62fef73208c2683485de24e53
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 11:52:52 2010 +0100

    Fix the two other glade files.

 settings-dialogs/xfwm4-tweaks-dialog.glade    |  257 ++++++++++++++++---------
 settings-dialogs/xfwm4-workspace-dialog.glade |  138 ++++++++------
 2 files changed, 248 insertions(+), 147 deletions(-)

diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 1ca45bb..fd19b07 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -1,65 +1,56 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Fri Oct 31 11:02:59 2008 -->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires libxfce4ui 4.5 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">75</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">75</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">90</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">90</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
+    <property name="value">90</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">90</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
+    <property name="value">90</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">90</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment5">
+    <property name="value">90</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">90</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment6">
+    <property name="value">90</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">90</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Window Manager Tweaks</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="default_height">480</property>
     <property name="icon_name">wmtweaks</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Fine-tune window behaviour and effects</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="main-vbox">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkNotebook" id="plug-child">
             <property name="visible">True</property>
@@ -69,26 +60,30 @@
               <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="cycle_minimum_check">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
                     <property name="label" translatable="yes">_Skip windows that have "skip pager"
 or "skip taskbar" properties set</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="cycle_hidden_check">
+                    <property name="label" translatable="yes">_Include hidden (i.e. iconified) windows</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Include hidden (i.e. iconified) windows</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -100,9 +95,10 @@ or "skip taskbar" properties set</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="cycle_workspaces_check">
+                    <property name="label" translatable="yes">Cycle _through windows on all workspaces</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Cycle _through windows on all workspaces</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -114,9 +110,10 @@ or "skip taskbar" properties set</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="cycle_draw_frame">
+                    <property name="label" translatable="yes">_Draw frame around selected windows while cycling</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Draw frame around selected windows while cycling</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -142,25 +139,29 @@ or "skip taskbar" properties set</property>
               <object class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="prevent_focus_stealing_check">
+                    <property name="label" translatable="yes">Activate _focus stealing prevention</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Activate _focus stealing prevention</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="focus_hint_check">
+                    <property name="label" translatable="yes">Honor _standard ICCCM focus hint</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Honor _standard ICCCM focus hint</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -173,6 +174,7 @@ or "skip taskbar" properties set</property>
                 <child>
                   <object class="GtkVBox" id="prevent_focus_stealing_box">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label11">
@@ -180,6 +182,9 @@ or "skip taskbar" properties set</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">When a window raises itself:</property>
                       </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment2">
@@ -190,22 +195,28 @@ or "skip taskbar" properties set</property>
                           <object class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
                             <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="activate_action_bring_option">
+                                <property name="label" translatable="yes">_Bring window on current workspace</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">_Bring window on current workspace</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="activate_action_switch_option">
+                                <property name="label" translatable="yes">Switch to win_dow's workspace</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Switch to win_dow's workspace</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -217,9 +228,10 @@ or "skip taskbar" properties set</property>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="activate_action_none_option">
+                                <property name="label" translatable="yes">Do _nothing</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Do _nothing</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -244,6 +256,9 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label2">
@@ -260,6 +275,7 @@ or "skip taskbar" properties set</property>
               <object class="GtkVBox" id="vbox4">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkHBox" id="hbox1">
@@ -276,6 +292,7 @@ or "skip taskbar" properties set</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -292,13 +309,15 @@ or "skip taskbar" properties set</property>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="raise_with_any_button_check">
+                    <property name="label" translatable="yes">_Raise windows when any mouse button is pressed</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Raise windows when any mouse button is pressed</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -310,9 +329,10 @@ or "skip taskbar" properties set</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="borderless_maximize_check">
+                    <property name="label" translatable="yes">Hide _frame of windows when maximized</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Hide _frame of windows when maximized</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -324,9 +344,10 @@ or "skip taskbar" properties set</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="restore_on_move_check">
+                    <property name="label" translatable="yes">Restore original _size of maximized windows when moving</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Restore original _size of maximized windows when moving</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -338,9 +359,10 @@ or "skip taskbar" properties set</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="snap_resist_check">
+                    <property name="label" translatable="yes">Use _edge resistance instead of window snapping</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Use _edge resistance instead of window snapping</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -352,9 +374,10 @@ or "skip taskbar" properties set</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="urgent_blink">
+                    <property name="label" translatable="yes">Notify of _urgency by making window's decoration blink</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Notify of _urgency by making window's decoration blink</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -366,9 +389,10 @@ or "skip taskbar" properties set</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="repeat_urgent_blink">
+                    <property name="label" translatable="yes">Keep urgent windows _blinking repeatedly</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Keep urgent windows _blinking repeatedly</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -379,6 +403,9 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label3">
@@ -395,26 +422,30 @@ or "skip taskbar" properties set</property>
               <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="scroll_workspaces_check">
+                    <property name="label" translatable="yes">Use the _mouse wheel on the desktop to switch workspaces</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Use the _mouse wheel on the desktop to switch workspaces</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="toggle_workspaces_check">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
                     <property name="label" translatable="yes">_Remember and recall previous workspace
 when switching via keyboard shortcuts</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -426,9 +457,10 @@ when switching via keyboard shortcuts</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="wrap_layout_check">
+                    <property name="label" translatable="yes">Wrap workspaces depending on the actual desktop _layout</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Wrap workspaces depending on the actual desktop _layout</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -440,9 +472,10 @@ when switching via keyboard shortcuts</property>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="wrap_cycle_check">
+                    <property name="label" translatable="yes">Wrap workspaces when the _first or the last workspace is reached</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Wrap workspaces when the _first or the last workspace is reached</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -453,6 +486,9 @@ when switching via keyboard shortcuts</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label4">
@@ -469,6 +505,7 @@ when switching via keyboard shortcuts</property>
               <object class="GtkVBox" id="vbox6">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label8">
@@ -481,6 +518,7 @@ when switching via keyboard shortcuts</property>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -494,12 +532,13 @@ when switching via keyboard shortcuts</property>
                         <child>
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
-                            <property context="yes" name="label" translatable="yes">Size|<i>Small</i></property>
+                            <property name="label" translatable="yes" context="yes">Size|<i>Small</i></property>
                             <property name="use_markup">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -517,7 +556,7 @@ when switching via keyboard shortcuts</property>
                         <child>
                           <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
-                            <property context="yes" name="label" translatable="yes">Size|<i>Large</i></property>
+                            <property name="label" translatable="yes" context="yes">Size|<i>Large</i></property>
                             <property name="use_markup">True</property>
                           </object>
                           <packing>
@@ -537,13 +576,17 @@ when switching via keyboard shortcuts</property>
                 <child>
                   <object class="GtkVBox" id="default_placement_box">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property context="yes" name="label" translatable="yes">By default, place windows:</property>
+                        <property name="label" translatable="yes" context="yes">By default, place windows:</property>
                       </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment10">
@@ -554,21 +597,27 @@ when switching via keyboard shortcuts</property>
                           <object class="GtkVBox" id="vbox18">
                             <property name="visible">True</property>
                             <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="placement_center_option">
+                                <property name="label" translatable="yes" context="yes">At the _center of the screen</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">At the _center of the screen</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="placement_mouse_option">
+                                <property name="label" translatable="yes" context="yes">Under the mouse _pointer</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property context="yes" name="label" translatable="yes">Under the mouse _pointer</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -593,11 +642,14 @@ when switching via keyboard shortcuts</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">4</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
-                <property context="yes" name="label" translatable="yes">_Placement</property>
+                <property name="label" translatable="yes" context="yes">_Placement</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -609,18 +661,21 @@ when switching via keyboard shortcuts</property>
               <object class="GtkVBox" id="vbox7">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="use_compositing_check">
+                    <property name="label" translatable="yes" context="yes">_Enable display compositing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property context="yes" name="label" translatable="yes">_Enable display compositing</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -628,13 +683,13 @@ when switching via keyboard shortcuts</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
-                        <property name="resize_mode">GTK_RESIZE_QUEUE</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="resize_mode">queue</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment3">
                             <property name="visible">True</property>
@@ -643,24 +698,28 @@ when switching via keyboard shortcuts</property>
                             <child>
                               <object class="GtkVBox" id="vbox8">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="unredirect_overlays_check">
+                                    <property name="label" translatable="yes" context="yes">Display _fullscreen overlay windows directly</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property context="yes" name="label" translatable="yes">Display _fullscreen overlay windows directly</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="show_frame_shadow_check">
+                                    <property name="label" translatable="yes" context="yes">Show shadows under _regular windows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property context="yes" name="label" translatable="yes">Show shadows under _regular windows</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -671,9 +730,10 @@ when switching via keyboard shortcuts</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="show_popup_shadow_check">
+                                    <property name="label" translatable="yes" context="yes">Show shadows under pop_up windows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property context="yes" name="label" translatable="yes">Show shadows under pop_up windows</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -684,9 +744,10 @@ when switching via keyboard shortcuts</property>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="show_dock_shadow_check">
+                                    <property name="label" translatable="yes" context="yes">Show shadows under _dock windows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property context="yes" name="label" translatable="yes">Show shadows under _dock windows</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -699,7 +760,7 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label12">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">Opaci_ty of window decorations:</property>
+                                    <property name="label" translatable="yes" context="yes">Opaci_ty of window decorations:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">frame_opacity_scale</property>
                                   </object>
@@ -719,19 +780,20 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label17">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Transparent</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="frame_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment2</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -743,7 +805,7 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label18">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Opaque</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -765,7 +827,7 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label13">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">Opacity of _inactive windows:</property>
+                                    <property name="label" translatable="yes" context="yes">Opacity of _inactive windows:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">inactive_opacity_scale</property>
                                   </object>
@@ -786,19 +848,20 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label19">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Transparent</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="inactive_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment3</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -810,7 +873,7 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Opaque</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -832,7 +895,7 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label14">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">Opacity of windows during _move:</property>
+                                    <property name="label" translatable="yes" context="yes">Opacity of windows during _move:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">move_opacity_scale</property>
                                   </object>
@@ -853,19 +916,20 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Transparent</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="move_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment4</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -877,7 +941,7 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label22">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Opaque</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -899,7 +963,7 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label15">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">Opacity of windows during resi_ze:</property>
+                                    <property name="label" translatable="yes" context="yes">Opacity of windows during resi_ze:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">resize_opacity_scale</property>
                                   </object>
@@ -920,19 +984,20 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label23">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Transparent</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="resize_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment5</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -944,7 +1009,7 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label24">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Opaque</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -966,7 +1031,7 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label16">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property context="yes" name="label" translatable="yes">Opacity of popup window_s:</property>
+                                    <property name="label" translatable="yes" context="yes">Opacity of popup window_s:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">popup_opacity_scale</property>
                                   </object>
@@ -987,19 +1052,20 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label25">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Transparent</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="popup_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+                                            <property name="update_policy">discontinuous</property>
                                             <property name="adjustment">adjustment6</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -1011,7 +1077,7 @@ when switching via keyboard shortcuts</property>
                                         <child>
                                           <object class="GtkLabel" id="label26">
                                             <property name="visible">True</property>
-                                            <property context="yes" name="label" translatable="yes"><i>Opaque</i></property>
+                                            <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
                                           </object>
                                           <packing>
@@ -1041,11 +1107,14 @@ when switching via keyboard shortcuts</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">5</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
-                <property context="yes" name="label" translatable="yes">C_ompositor</property>
+                <property name="label" translatable="yes" context="yes">C_ompositor</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -1061,35 +1130,47 @@ when switching via keyboard shortcuts</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="layout_style">edge</property>
             <child>
               <object class="GtkButton" id="button2">
+                <property name="label" context="yes">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property context="yes" name="label">gtk-help</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button1">
+                <property name="label" context="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property context="yes" name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="0">button2</action-widget>
+      <action-widget response="0">button1</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/settings-dialogs/xfwm4-workspace-dialog.glade b/settings-dialogs/xfwm4-workspace-dialog.glade
index ed638ec..66fc92d 100644
--- a/settings-dialogs/xfwm4-workspace-dialog.glade
+++ b/settings-dialogs/xfwm4-workspace-dialog.glade
@@ -1,58 +1,46 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Fri Oct 31 11:02:28 2008 -->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires libxfce4ui 4.5 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment5">
     <property name="upper">100</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Workspaces</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="default_width">400</property>
     <property name="default_height">400</property>
     <property name="icon_name">xfce4-workspaces</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Set number and names of workspaces</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="main-vbox">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkHBox" id="plug-child">
@@ -62,7 +50,7 @@
               <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
@@ -71,6 +59,7 @@
                       <object class="GtkVBox" id="workspaces">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkHBox" id="hbox3">
@@ -86,6 +75,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -105,20 +95,20 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">etched-in</property>
                             <child>
                               <object class="GtkTreeView" id="treeview_ws_names">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="headers_clickable">True</property>
                                 <property name="rules_hint">True</property>
                               </object>
                             </child>
@@ -139,12 +129,15 @@
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkFrame" id="frame2">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
@@ -153,6 +146,7 @@
                       <object class="GtkVBox" id="margins">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label5">
@@ -163,6 +157,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -185,18 +180,6 @@
                                     <property name="n_rows">3</property>
                                     <property name="n_columns">3</property>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
                                       <object class="GtkSpinButton" id="margin_left_spinbutton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -205,8 +188,8 @@
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -220,8 +203,8 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -235,8 +218,8 @@
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -262,15 +245,27 @@
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
-                            <child type="label">
+                            <child type="label_item">
                               <placeholder/>
                             </child>
                           </object>
@@ -305,41 +300,53 @@
             <property name="visible">True</property>
             <child>
               <object class="GtkButton" id="button2">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-help</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="0">button2</action-widget>
+      <action-widget response="0">button1</action-widget>
+    </action-widgets>
   </object>
   <object class="XfceTitledDialog" id="change_name_dialog">
     <property name="title" translatable="yes">Change workspace name</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">xfce4-workspaces</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="transient_for">main-dialog</property>
     <property name="has_separator">False</property>
@@ -362,6 +369,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -385,37 +393,49 @@
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button3">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button4">
+                <property name="label">gtk-save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-save</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="0">button3</action-widget>
+      <action-widget response="0">button4</action-widget>
+    </action-widgets>
   </object>
 </interface>



More information about the Xfce4-commits mailing list