GNOME.org
 

[vinagre] Port from Gtk[H|V]Box to GtkBox

commit ecdc43b0d198c226de5e37a1f8e19054e26c6c50
Author: David King <amigadave amigadave com>
Date:   Sat Aug 13 11:07:26 2011 +0200

    Port from Gtk[H|V]Box to GtkBox

 data/vinagre.ui                      |   66 ++++++++++++++++++++++-----------
 plugins/rdp/vinagre-rdp-plugin.c     |    4 +-
 plugins/spice/vinagre-spice-plugin.c |    6 ++--
 plugins/ssh/vinagre-ssh-plugin.c     |    4 +-
 plugins/vnc/vinagre-vnc-plugin.c     |    6 ++--
 vinagre/vinagre-bookmarks-tree.c     |    4 ++-
 vinagre/vinagre-bookmarks-tree.h     |    4 +-
 vinagre/vinagre-notebook.c           |   36 +++++++++---------
 vinagre/vinagre-tab.c                |    4 ++-
 vinagre/vinagre-tab.h                |    4 +-
 vinagre/vinagre-window.c             |    2 +-
 11 files changed, 83 insertions(+), 57 deletions(-)
---
diff --git a/data/vinagre.ui b/data/vinagre.ui
index 7c2f54c..b158bd8 100644
--- a/data/vinagre.ui
+++ b/data/vinagre.ui
@@ -102,7 +102,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
+	    <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -283,12 +284,14 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkVBox" id="main_box">
+          <object class="GtkBox" id="main_box">
+	    <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">18</property>
             <child>
-              <object class="GtkVBox" id="vbox8">
+              <object class="GtkBox" id="vbox8">
+	        <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -414,7 +417,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox9">
+              <object class="GtkBox" id="vbox9">
+	        <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -454,7 +458,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="plugin_options_vbox">
+                  <object class="GtkBox" id="plugin_options_vbox">
+	            <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -476,7 +481,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox10">
+              <object class="GtkBox" id="vbox10">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -498,7 +504,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="folder_box">
+                  <object class="GtkBox" id="folder_box">
+                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -645,12 +652,14 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox4">
+          <object class="GtkBox" id="vbox4">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">18</property>
             <child>
-              <object class="GtkVBox" id="vbox7">
+              <object class="GtkBox" id="vbox7">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -724,7 +733,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox6">
+              <object class="GtkBox" id="vbox6">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -746,7 +756,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="folder_box1">
+                  <object class="GtkBox" id="folder_box1">
+                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -800,7 +811,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
         <property name="orientation">vertical</property>
         <property name="spacing">18</property>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkBox" id="vbox2">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -899,7 +911,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkBox" id="hbox1">
+                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
@@ -1005,7 +1018,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox5">
+          <object class="GtkBox" id="vbox5">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -1053,7 +1067,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="plugin_options_connect_vbox">
+          <object class="GtkBox" id="plugin_options_connect_vbox">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -1132,12 +1147,14 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox11">
+          <object class="GtkBox" id="vbox11">
+	    <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -1180,7 +1197,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox12">
+              <object class="GtkBox" id="vbox12">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">4</property>
@@ -1201,7 +1219,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox3">
+                  <object class="GtkBox" id="hbox3">
+                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -1240,7 +1259,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox4">
+                  <object class="GtkBox" id="hbox4">
+                    <property name="orientation">horizontal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -1260,7 +1280,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <child>
-                          <object class="GtkVBox" id="vbox13">
+                          <object class="GtkBox" id="vbox13">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
@@ -1380,7 +1401,8 @@ Jonh Wendell &lt;jwendell gnome org&gt;</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <object class="GtkBox" id="vbox3">
+	    <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
diff --git a/plugins/rdp/vinagre-rdp-plugin.c b/plugins/rdp/vinagre-rdp-plugin.c
index dfb4c9c..f1b09b2 100644
--- a/plugins/rdp/vinagre-rdp-plugin.c
+++ b/plugins/rdp/vinagre-rdp-plugin.c
@@ -91,7 +91,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   GtkWidget *box, *label, *u_box, *u_entry;
   gchar     *str;
 
-  box = gtk_vbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   str = g_strdup_printf ("<b>%s</b>", _("RDP Options"));
   label = gtk_label_new (str);
@@ -100,7 +100,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   gtk_container_add (GTK_CONTAINER (box), label);
 
-  u_box = gtk_hbox_new (FALSE, 6);
+  u_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   label = gtk_label_new_with_mnemonic (_("_Username:"));
   gtk_box_pack_start (GTK_BOX (u_box), label, FALSE, FALSE, 0);
diff --git a/plugins/spice/vinagre-spice-plugin.c b/plugins/spice/vinagre-spice-plugin.c
index f08dac0..c51eb0b 100644
--- a/plugins/spice/vinagre-spice-plugin.c
+++ b/plugins/spice/vinagre-spice-plugin.c
@@ -204,7 +204,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   gchar	    *str, *ssh_host;
   gboolean  has_conn = VINAGRE_IS_SPICE_CONNECTION (conn);
 
-  box = gtk_vbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
   str = g_strdup_printf ("<b>%s</b>", _("SPICE Options"));
   label = gtk_label_new (str);
@@ -251,7 +251,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
 				: vinagre_cache_prefs_get_boolean ("spice-connection", "scaling", FALSE));
 
   /* SSH Tunneling */
-  box2 = gtk_hbox_new (FALSE, 5);
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   /* Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel*/
   check = gtk_check_button_new_with_mnemonic (_("Use h_ost"));
@@ -290,7 +290,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   gtk_table_attach_defaults (table, box2, 1, 2, 3, 4);
 
   /* Password */
-  box2 = gtk_hbox_new (FALSE, 4);
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   label = gtk_label_new_with_mnemonic (_("_Password:"));
   gtk_box_pack_start (GTK_BOX (box2), label, FALSE, FALSE, 0);
diff --git a/plugins/ssh/vinagre-ssh-plugin.c b/plugins/ssh/vinagre-ssh-plugin.c
index bde7b8e..ae37366 100644
--- a/plugins/ssh/vinagre-ssh-plugin.c
+++ b/plugins/ssh/vinagre-ssh-plugin.c
@@ -96,7 +96,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   GtkWidget *box, *label, *u_box, *u_entry;
   gchar     *str;
 
-  box = gtk_vbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   str = g_strdup_printf ("<b>%s</b>", _("SSH Options"));
   label = gtk_label_new (str);
@@ -105,7 +105,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
 
-  u_box = gtk_hbox_new (FALSE, 6);
+  u_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   label = gtk_label_new_with_mnemonic (_("_Username:"));
   gtk_box_pack_start (GTK_BOX (u_box), label, FALSE, FALSE, 0);
diff --git a/plugins/vnc/vinagre-vnc-plugin.c b/plugins/vnc/vinagre-vnc-plugin.c
index 774b938..32e578d 100644
--- a/plugins/vnc/vinagre-vnc-plugin.c
+++ b/plugins/vnc/vinagre-vnc-plugin.c
@@ -247,7 +247,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   gchar     *str, *ssh_host;
   gboolean has_conn = VINAGRE_IS_VNC_CONNECTION (conn), active;
 
-  box = gtk_vbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   str = g_strdup_printf ("<b>%s</b>", _("VNC Options"));
   label = gtk_label_new (str);
@@ -300,7 +300,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
 				: vinagre_cache_prefs_get_boolean ("vnc-connection", "lossy-encoding", FALSE));
 
   /* Color depth combo box */
-  box2 = gtk_hbox_new (FALSE, 6);
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   label = gtk_label_new_with_mnemonic (_("Color _Depth:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (label), FALSE, FALSE, 0);
@@ -321,7 +321,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
   gtk_container_add (GTK_CONTAINER (box), box2);
 
   /* SSH Tunneling */
-  box2 = gtk_hbox_new (FALSE, 6);
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   /* Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel*/
   check = gtk_check_button_new_with_mnemonic (_("Use h_ost"));
diff --git a/vinagre/vinagre-bookmarks-tree.c b/vinagre/vinagre-bookmarks-tree.c
index 2f9f072..c4824b2 100644
--- a/vinagre/vinagre-bookmarks-tree.c
+++ b/vinagre/vinagre-bookmarks-tree.c
@@ -39,7 +39,7 @@ enum {
   NUM_COLS
 };
 
-G_DEFINE_TYPE (VinagreBookmarksTree, vinagre_bookmarks_tree, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (VinagreBookmarksTree, vinagre_bookmarks_tree, GTK_TYPE_BOX);
 
 static void
 vinagre_bookmarks_tree_row_activated_cb (GtkTreeView          *treeview,
@@ -143,6 +143,8 @@ vinagre_bookmarks_tree_init (VinagreBookmarksTree *tree)
 
   tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree, VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTreePrivate);
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (tree), GTK_ORIENTATION_VERTICAL);
+
   /* Create the scrolled window */
   scroll = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
diff --git a/vinagre/vinagre-bookmarks-tree.h b/vinagre/vinagre-bookmarks-tree.h
index c3689c8..27d27ce 100644
--- a/vinagre/vinagre-bookmarks-tree.h
+++ b/vinagre/vinagre-bookmarks-tree.h
@@ -40,12 +40,12 @@ typedef struct _VinagreBookmarksTreePrivate VinagreBookmarksTreePrivate;
 
 struct _VinagreBookmarksTreeClass
 {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 };
 
 struct _VinagreBookmarksTree
 {
-  GtkVBox parent_instance;
+  GtkBox parent_instance;
   VinagreBookmarksTreePrivate *priv;
 };
 
diff --git a/vinagre/vinagre-notebook.c b/vinagre/vinagre-notebook.c
index fce9fd7..e772bce 100644
--- a/vinagre/vinagre-notebook.c
+++ b/vinagre/vinagre-notebook.c
@@ -510,7 +510,7 @@ static GtkWidget *
 build_tab_label (VinagreNotebook *nb, 
 		 VinagreTab      *tab)
 {
-  GtkWidget *hbox, *label_hbox, *label_ebox;
+  GtkWidget *box, *label_box, *label_ebox;
   GtkWidget *label, *dummy_label;
   GtkWidget *close_button, *spinner;
   GtkRcStyle *rcstyle;
@@ -518,15 +518,15 @@ build_tab_label (VinagreNotebook *nb,
   GtkWidget *icon;
   gchar     *name;
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   label_ebox = gtk_event_box_new ();
   gtk_event_box_set_visible_window (GTK_EVENT_BOX (label_ebox), FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), label_ebox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (box), label_ebox, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text (label_ebox, _("Connecting..."));
 
-  label_hbox = gtk_hbox_new (FALSE, 4);
-  gtk_container_add (GTK_CONTAINER (label_ebox), label_hbox);
+  label_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_container_add (GTK_CONTAINER (label_ebox), label_box);
 
   /* setup close button */
   close_button = gtk_button_new ();
@@ -548,7 +548,7 @@ build_tab_label (VinagreNotebook *nb,
   image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
 					  GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (close_button), image);
-  gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box), close_button, FALSE, FALSE, 0);
 
   gtk_widget_set_tooltip_text (close_button, _("Close connection"));
 
@@ -559,12 +559,12 @@ build_tab_label (VinagreNotebook *nb,
 
   /* setup spinner */
   spinner = gtk_spinner_new();
-  gtk_box_pack_start (GTK_BOX (label_hbox), spinner, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (label_box), spinner, FALSE, FALSE, 0);
 
   /* setup site icon */
   icon = gtk_image_new_from_icon_name (vinagre_tab_get_icon_name (tab),
 				       GTK_ICON_SIZE_MENU);
-  gtk_box_pack_start (GTK_BOX (label_hbox), icon, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (label_box), icon, FALSE, FALSE, 0);
 	
   /* setup label */
   name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab));
@@ -572,39 +572,39 @@ build_tab_label (VinagreNotebook *nb,
   g_free (name);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_misc_set_padding (GTK_MISC (label), 0, 0);
-  gtk_box_pack_start (GTK_BOX (label_hbox), label, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, FALSE, 0);
 
   dummy_label = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (label_hbox), dummy_label, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (label_box), dummy_label, TRUE, TRUE, 0);
 	
-  gtk_widget_show (hbox);
+  gtk_widget_show (box);
   gtk_widget_show (label_ebox);
-  gtk_widget_show (label_hbox);
+  gtk_widget_show (label_box);
   gtk_widget_show (label);
   gtk_widget_show (dummy_label);	
   gtk_widget_show (image);
   gtk_widget_show (close_button);
   
-  g_object_set_data (G_OBJECT (hbox), "label", label);
+  g_object_set_data (G_OBJECT (box), "label", label);
   g_object_set_data (G_OBJECT (tab),  "label", label);
-  g_object_set_data (G_OBJECT (hbox), "label-ebox", label_ebox);
+  g_object_set_data (G_OBJECT (box), "label-ebox", label_ebox);
   g_object_set_data (G_OBJECT (tab),  "label-ebox", label_ebox);
   g_object_set_data (G_OBJECT (tab), "spinner", spinner);
   g_object_set_data (G_OBJECT (tab), "icon", icon);
-  g_object_set_data (G_OBJECT (hbox), "close-button", close_button);
+  g_object_set_data (G_OBJECT (box), "close-button", close_button);
   g_object_set_data (G_OBJECT (tab),  "close-button", close_button);
 
-  gtk_drag_source_set ( GTK_WIDGET (hbox),
+  gtk_drag_source_set ( GTK_WIDGET (box),
 			GDK_BUTTON1_MASK,
 			vinagre_target_list,
 			G_N_ELEMENTS (vinagre_target_list),
 			GDK_ACTION_COPY );
-  g_signal_connect (hbox,
+  g_signal_connect (box,
 		    "drag-data-get",
 		    G_CALLBACK (drag_data_get_handl),
 		    tab);
 
-  return hbox;
+  return box;
 }
 
 void
diff --git a/vinagre/vinagre-tab.c b/vinagre/vinagre-tab.c
index aace0cc..3267882 100644
--- a/vinagre/vinagre-tab.c
+++ b/vinagre/vinagre-tab.c
@@ -49,7 +49,7 @@ struct _VinagreTabPrivate
   gboolean          has_screenshot;
 };
 
-G_DEFINE_ABSTRACT_TYPE (VinagreTab, vinagre_tab, GTK_TYPE_VBOX)
+G_DEFINE_ABSTRACT_TYPE (VinagreTab, vinagre_tab, GTK_TYPE_BOX)
 
 /* Signals */
 enum
@@ -546,6 +546,8 @@ vinagre_tab_add_recent_used (VinagreTab *tab)
 static void
 vinagre_tab_init (VinagreTab *tab)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (tab), GTK_ORIENTATION_VERTICAL);
+
   tab->priv = VINAGRE_TAB_GET_PRIVATE (tab);
   tab->priv->save_credentials = FALSE;
   tab->priv->keyring_item_id = 0;
diff --git a/vinagre/vinagre-tab.h b/vinagre/vinagre-tab.h
index 979869c..01bd36b 100644
--- a/vinagre/vinagre-tab.h
+++ b/vinagre/vinagre-tab.h
@@ -53,7 +53,7 @@ typedef enum
 
 struct _VinagreTab 
 {
-  GtkVBox vbox;
+  GtkBox box;
   VinagreTabPrivate *priv;
 };
 
@@ -65,7 +65,7 @@ typedef struct
 
 struct _VinagreTabClass 
 {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   /* Signals */
   void		(* tab_connected)			(VinagreTab *tab);
diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c
index 63ed0ed..502a9fb 100644
--- a/vinagre/vinagre-window.c
+++ b/vinagre/vinagre-window.c
@@ -780,7 +780,7 @@ vinagre_window_init (VinagreWindow *window)
   window->priv->fullscreen = FALSE;
   window->priv->dispose_has_run = FALSE;
 
-  main_box = gtk_vbox_new (FALSE, 0);
+  main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), main_box);
   gtk_widget_show (main_box);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]