From 7f257c725d9b96cac4270f8401b0df08a080116e Mon Sep 17 00:00:00 2001
From: Volker Sobek <reklov@live.com>
Date: Sun, 15 Dec 2013 17:33:39 +0100
Subject: [PATCH] UI: Remove deprecated GtkVBox, GtkHBox

Use GtkBox instead.

https://bugzilla.gnome.org/show_bug.cgi?id=720497
---
 data/gnome-chess.ui  | 19 ++++++++++---------
 data/preferences.ui  |  9 +++++----
 src/gnome-chess.vala |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/data/gnome-chess.ui b/data/gnome-chess.ui
index 1f5995f..574e806 100644
--- a/data/gnome-chess.ui
+++ b/data/gnome-chess.ui
@@ -13,13 +13,14 @@
     <property name="can_focus">False</property>
     <property name="title">Chess</property>
     <property name="default_width">700</property>
-    <signal name="window-state-event" handler="gnome_chess_app_window_state_event_cb" swapped="no"/>
     <signal name="configure-event" handler="gnome_chess_app_configure_event_cb" swapped="no"/>
     <signal name="delete-event" handler="gnome_chess_app_delete_event_cb" swapped="no"/>
+    <signal name="window-state-event" handler="gnome_chess_app_window_state_event_cb" swapped="no"/>
     <child>
-      <object class="GtkVBox" id="main_vbox">
+      <object class="GtkBox" id="main_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
@@ -159,7 +160,6 @@
             <child>
               <object class="GtkToolButton" id="pause_game_button">
                 <property name="visible">True</property>
-                <property name="sensitive">True</property>
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Pause the game</property>
                 <property name="label" translatable="yes" comments="The pause game button">Pause</property>
@@ -197,17 +197,18 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="view_box">
+          <object class="GtkBox" id="view_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">3</property>
             <child>
-              <object class="GtkHBox" id="navigation_box">
+              <object class="GtkBox" id="navigation_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkHBox" id="left_nav_box">
+                  <object class="GtkBox" id="left_nav_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="homogeneous">True</property>
@@ -330,7 +331,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="right_nav_box">
+                  <object class="GtkBox" id="right_nav_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
@@ -403,9 +404,9 @@
   </object>
   <object class="GtkSizeGroup" id="nav_bar_sizegroup">
     <widgets>
-      <widget name="right_nav_box"/>
-      <widget name="left_nav_box"/>
       <widget name="toolbar"/>
+      <widget name="left_nav_box"/>
+      <widget name="right_nav_box"/>
     </widgets>
   </object>
 </interface>
diff --git a/data/preferences.ui b/data/preferences.ui
index 94818d6..1a24fb1 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -339,7 +339,7 @@
                     <property name="can_focus">False</property>
                     <property name="left_padding">18</property>
                     <child>
-                      <object class="GtkHBox" id="hbox22">
+                      <object class="GtkBox" id="hbox22">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
@@ -427,7 +427,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox2">
+                  <object class="GtkBox" id="hbox2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">5</property>
@@ -554,9 +554,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="view_box">
+                  <object class="GtkBox" id="view_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkCheckButton" id="show_3d_check">
                         <property name="label" translatable="yes" comments="Preferences Dialog: Check box for selecting if 3D view is available">3_D chess view</property>
@@ -575,7 +576,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
diff --git a/src/gnome-chess.vala b/src/gnome-chess.vala
index 14fd860..ce5d176 100644
--- a/src/gnome-chess.vala
+++ b/src/gnome-chess.vala
@@ -156,7 +156,7 @@ public class Application : Gtk.Application
         history_combo = (Gtk.ComboBox) builder.get_object ("history_combo");
         white_time_label = (Gtk.Widget) builder.get_object ("white_time_label");
         black_time_label = (Gtk.Widget) builder.get_object ("black_time_label");
-        var view_box = (Gtk.VBox) builder.get_object ("view_box");
+        var view_box = (Gtk.Box) builder.get_object ("view_box");
         view_container = (Gtk.Container) builder.get_object ("view_container");
         builder.connect_signals (this);