3 files changed, 10 insertions, 7 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index fa5076aa8..c314c7d33 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -90,7 +90,7 @@ struct _EphyEmbedPrivate
   guint tab_message_id;
 };
 
-G_DEFINE_TYPE (EphyEmbed, ephy_embed, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (EphyEmbed, ephy_embed, GTK_TYPE_BOX)
 
 static void
 restore_zoom_level (EphyEmbed *embed,
@@ -616,9 +616,12 @@ ephy_embed_init (EphyEmbed *embed)
 {
   embed->priv = EPHY_EMBED_GET_PRIVATE (embed);
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (embed),
+                                  GTK_ORIENTATION_VERTICAL);
+
   embed->priv->scrolled_window = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
-  embed->priv->paned = GTK_PANED (gtk_vpaned_new ());
-  embed->priv->top_widgets_vbox = GTK_BOX (gtk_vbox_new (FALSE, 0));
+  embed->priv->paned = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_VERTICAL));
+  embed->priv->top_widgets_vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
   embed->priv->seq_context_id = 1;
   embed->priv->seq_message_id = 1;
   embed->priv->tab_message_id = ephy_embed_statusbar_get_context_id (embed, EPHY_EMBED_STATUSBAR_TAB_MESSAGE_CONTEXT_DESCRIPTION);
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index b30b85fba..72cc55817 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -44,14 +44,14 @@ typedef struct _EphyEmbedPrivate EphyEmbedPrivate;
 #define EPHY_EMBED_STATUSBAR_HELP_MESSAGE_CONTEXT_DESCRIPTION "help_message"
 
 struct _EphyEmbed {
-  GtkVBox parent_instance;
+  GtkBox parent_instance;
 
   /*< private >*/
   EphyEmbedPrivate *priv;
 };
 
 struct _EphyEmbedClass {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 };
 
 GType        ephy_embed_get_type                 (void);
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 8cd73a769..8830bc331 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -745,7 +745,7 @@ request_decision_on_storing (StorePasswordData *store_data)
   info_bar = gtk_info_bar_new ();
 
   action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar));
-  button_box = gtk_hbutton_box_new ();
+  button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_container_add (GTK_CONTAINER (action_area), button_box);
 
   action_button = gtk_button_new_with_label (_("Not now"));
@@ -1717,7 +1717,7 @@ geolocation_policy_decision_requested_cb (WebKitWebView *web_view,
   /* Buttons */
   action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar));
 
-  button_box = gtk_hbutton_box_new ();
+  button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_container_add (GTK_CONTAINER (action_area), button_box);
 
   /* Translators: Geolocation policy for a specific site. */