[cheese] Convert deprecated GtkVBox and GtkHBox to GtkBox

[David King <davidk src gnome org>]

commit 59bdd07f61ae4253f8b7b5430a71ca93aa0e0eff
Author: Jonathan Laver <jonathan laver gmail com>
Date:   Sun Nov 20 14:42:14 2011 +0000

    Convert deprecated GtkVBox and GtkHBox to GtkBox
    
    Fixes bug 661661.

 data/cheese-main-window.ui    |   30 ++++++++++++++++++++----------
 src/cheese-window.vala        |   12 ++++++------
 src/thumbview/eog-thumb-nav.c |    4 ++--
 src/thumbview/eog-thumb-nav.h |    4 ++--
 src/vapi/eogthumbnav.vapi     |    2 +-
 5 files changed, 31 insertions(+), 21 deletions(-)
---
diff --git a/data/cheese-main-window.ui b/data/cheese-main-window.ui
index 41b3d3a..d82f163 100644
--- a/data/cheese-main-window.ui
+++ b/data/cheese-main-window.ui
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <object class="GtkVBox" id="mainbox_normal">
+  <object class="GtkBox" id="mainbox_normal">
+    <property name="orientation">vertical</property>
     <property name="homogeneous">False</property>
     <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
@@ -13,9 +14,11 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="content_area">
+      <object class="GtkBox" id="content_area">
+        <property name="orientation">horizontal</property>
         <child>
-          <object class="GtkVBox" id="view_area">
+          <object class="GtkBox" id="view_area">
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkClutterEmbed" id="viewport">
                 <property name="events">GDK_POINTER_MOTION_MASK</property>
@@ -32,9 +35,11 @@
                 <property name="left_padding">24</property>
                 <property name="right_padding">24</property>
                 <child>
-                  <object class="GtkHBox" id="buttons_area">
+                  <object class="GtkBox" id="buttons_area">
+                    <property name="orientation">horizontal</property>
                     <child>
-                      <object class="GtkHBox" id="mode_toggle_buttons">
+                      <object class="GtkBox" id="mode_toggle_buttons">
+                        <property name="orientation">horizontal</property>
                         <property name="homogeneous">True</property>
                         <property name="spacing">2</property>
                         <child>
@@ -88,7 +93,8 @@
                             <property name="related-action">take_photo</property>
                             <property name="tooltip_text" translatable="yes">Take a photo</property>
                             <child>
-                              <object class="GtkHBox" id="take_action_button_internal_hbox">
+                              <object class="GtkBox" id="take_action_button_internal_hbox">
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkImage" id="take_action_button_internal_image">
@@ -115,7 +121,8 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="effects_actions_pack">
+                      <object class="GtkBox" id="effects_actions_pack">
+                        <property name="orientation">horizontal</property>
                         <property name="spacing">0</property>
                         <child>
                           <object class="GtkButton" id="effects_prev_page_button">
@@ -135,7 +142,8 @@
                             <property name="related-action">effects_toggle</property>
                             <property name="tooltip_text" translatable="yes">Effects</property>
                             <child>
-                              <object class="GtkHBox" id="effects_toggle_button_internal_hbox">
+                              <object class="GtkBox" id="effects_toggle_button_internal_hbox">
+                                <property name="orientation">horizontal</property>
                                 <property name="visible">True</property>
                                 <property name="spacing">2</property>
                                 <child>
@@ -177,7 +185,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="leave_fullscreen_button_bin">
+                      <object class="GtkBox" id="leave_fullscreen_button_bin">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">False</property>
                         <property name="no-show-all">True</property>
                         <child>
@@ -186,7 +195,8 @@
                             <property name="related-action">fullscreen</property>
                             <property name="tooltip_text" translatable="yes">Leave fullscreen</property>
                             <child>
-                              <object class="GtkHBox" id="fullscreen_button_internal_hbox">
+                              <object class="GtkBox" id="fullscreen_button_internal_hbox">
+                                <property name="orientation">horizontal</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkImage" id="fullscreen_button_internal_image">
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 688188c..f9ea127 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -43,13 +43,13 @@ public class Cheese.MainWindow : Gtk.Window
 
   private Gtk.Widget       thumbnails;
   private GtkClutter.Embed viewport_widget;
-  private Gtk.VBox         main_vbox;
+  private Gtk.Box          main_vbox;
   private Eog.ThumbNav     thumb_nav;
   private Cheese.ThumbView thumb_view;
   private Gtk.Alignment    thumbnails_right;
   private Gtk.Alignment    thumbnails_bottom;
   private Gtk.MenuBar      menubar;
-  private Gtk.HBox         leave_fullscreen_button_container;
+  private Gtk.Box          leave_fullscreen_button_container;
   private Gtk.ToggleButton photo_toggle_button;
   private Gtk.ToggleButton video_toggle_button;
   private Gtk.ToggleButton burst_toggle_button;
@@ -58,7 +58,7 @@ public class Cheese.MainWindow : Gtk.Window
   private Gtk.Image        take_action_button_image;
   private Gtk.ToggleButton effects_toggle_button;
   private Gtk.Button       leave_fullscreen_button;
-  private Gtk.HBox         buttons_area;
+  private Gtk.Box          buttons_area;
   private Gtk.Menu         thumbnail_popup;
 
   private Clutter.Stage     viewport;
@@ -1351,14 +1351,14 @@ public class Cheese.MainWindow : Gtk.Window
       error ("Error: %s", err.message);
     }
 
-    main_vbox                         = gtk_builder.get_object ("mainbox_normal") as Gtk.VBox;
+    main_vbox                         = gtk_builder.get_object ("mainbox_normal") as Gtk.Box;
     thumbnails                        = gtk_builder.get_object ("thumbnails") as Gtk.Widget;
     viewport_widget                   = gtk_builder.get_object ("viewport") as GtkClutter.Embed;
     viewport                          = viewport_widget.get_stage () as Clutter.Stage;
     thumbnails_right                  = gtk_builder.get_object ("thumbnails_right") as Gtk.Alignment;
     thumbnails_bottom                 = gtk_builder.get_object ("thumbnails_bottom") as Gtk.Alignment;
     menubar                           = gtk_builder.get_object ("main_menubar") as Gtk.MenuBar;
-    leave_fullscreen_button_container = gtk_builder.get_object ("leave_fullscreen_button_bin") as Gtk.HBox;
+    leave_fullscreen_button_container = gtk_builder.get_object ("leave_fullscreen_button_bin") as Gtk.Box;
     photo_toggle_button               = gtk_builder.get_object ("photo_toggle_button") as Gtk.ToggleButton;
     video_toggle_button               = gtk_builder.get_object ("video_toggle_button") as Gtk.ToggleButton;
     burst_toggle_button               = gtk_builder.get_object ("burst_toggle_button") as Gtk.ToggleButton;
@@ -1367,7 +1367,7 @@ public class Cheese.MainWindow : Gtk.Window
     take_action_button_image          = gtk_builder.get_object ("take_action_button_internal_image") as Gtk.Image;
     effects_toggle_button             = gtk_builder.get_object ("effects_toggle_button") as Gtk.ToggleButton;
     leave_fullscreen_button           = gtk_builder.get_object ("leave_fullscreen_button") as Gtk.Button;
-    buttons_area                      = gtk_builder.get_object ("buttons_area") as Gtk.HBox;
+    buttons_area                      = gtk_builder.get_object ("buttons_area") as Gtk.Box;
     thumbnail_popup                   = gtk_builder.get_object ("thumbnail_popup") as Gtk.Menu;
 
     take_photo_action        = gtk_builder.get_object ("take_photo") as Gtk.Action;
diff --git a/src/thumbview/eog-thumb-nav.c b/src/thumbview/eog-thumb-nav.c
index d64e72c..d37fec2 100644
--- a/src/thumbview/eog-thumb-nav.c
+++ b/src/thumbview/eog-thumb-nav.c
@@ -35,7 +35,7 @@
 #define EOG_THUMB_NAV_GET_PRIVATE(object) \
   (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_THUMB_NAV, EogThumbNavPrivate))
 
-G_DEFINE_TYPE (EogThumbNav, eog_thumb_nav, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (EogThumbNav, eog_thumb_nav, GTK_TYPE_BOX);
 
 #define EOG_THUMB_NAV_SCROLL_INC     20
 #define EOG_THUMB_NAV_SCROLL_MOVE    20
@@ -442,7 +442,7 @@ eog_thumb_nav_init (EogThumbNav *nav)
                     G_CALLBACK (eog_thumb_nav_stop_scroll),
                     nav);
 
-  priv->vbox = gtk_vbox_new (FALSE, 0);
+  priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
   priv->sw = gtk_scrolled_window_new (NULL, NULL);
 
diff --git a/src/thumbview/eog-thumb-nav.h b/src/thumbview/eog-thumb-nav.h
index bb6ea2c..a800410 100644
--- a/src/thumbview/eog-thumb-nav.h
+++ b/src/thumbview/eog-thumb-nav.h
@@ -43,14 +43,14 @@ typedef struct _EogThumbNavPrivate EogThumbNavPrivate;
 
 struct _EogThumbNav
 {
-  GtkHBox base_instance;
+  GtkBox base_instance;
 
   EogThumbNavPrivate *priv;
 };
 
 struct _EogThumbNavClass
 {
-  GtkHBoxClass parent_class;
+  GtkBoxClass parent_class;
 };
 
 GType eog_thumb_nav_get_type (void) G_GNUC_CONST;
diff --git a/src/vapi/eogthumbnav.vapi b/src/vapi/eogthumbnav.vapi
index 2f79d1e..a4c625e 100644
--- a/src/vapi/eogthumbnav.vapi
+++ b/src/vapi/eogthumbnav.vapi
@@ -2,7 +2,7 @@ using Gtk;
 namespace Eog
 {
   [CCode (cheader_filename = "thumbview/eog-thumb-nav.h")]
-  public class ThumbNav : Gtk.HBox
+  public class ThumbNav : Gtk.Box
   {
     public ThumbNav (Gtk.Widget thumbview, bool show_buttons);
     public bool get_show_buttons ();