GNOME.org
 

[brasero] Revert accidental commit

commit 29b3a0dad81ef6ef60e974532f7a8dc4f3d007f2
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Jul 12 14:58:39 2011 +0200

    Revert accidental commit

 libbrasero-burn/brasero-burn-dialog.c        |    4 ++--
 libbrasero-burn/brasero-burn-options.c       |    8 ++++----
 libbrasero-burn/brasero-drive-properties.c   |    6 +++---
 libbrasero-burn/brasero-image-properties.c   |    2 +-
 libbrasero-burn/brasero-image-type-chooser.c |    4 ++--
 libbrasero-burn/brasero-image-type-chooser.h |    4 ++--
 libbrasero-burn/brasero-progress.c           |    6 +++---
 libbrasero-burn/brasero-progress.h           |    4 ++--
 libbrasero-burn/brasero-src-image.c          |    4 ++--
 libbrasero-burn/brasero-status-dialog.c      |    2 +-
 libbrasero-burn/brasero-sum-dialog.c         |    2 +-
 libbrasero-burn/brasero-tool-dialog.c        |    4 ++--
 libbrasero-burn/brasero-video-options.c      |    2 +-
 libbrasero-utils/brasero-disc-message.c      |    2 +-
 libbrasero-utils/brasero-jacket-background.c |   10 +++++-----
 libbrasero-utils/brasero-jacket-edit.c       |    6 +++---
 libbrasero-utils/brasero-jacket-edit.h       |    4 ++--
 libbrasero-utils/brasero-jacket-font.c       |    2 +-
 libbrasero-utils/brasero-jacket-font.h       |    4 ++--
 libbrasero-utils/brasero-misc.c              |    8 ++++----
 libbrasero-utils/brasero-notify.c            |    2 +-
 nautilus/nautilus-burn-bar.c                 |    2 +-
 nautilus/nautilus-burn-bar.h                 |    4 ++--
 src/brasero-app.c                            |    4 ++--
 src/brasero-audio-disc.c                     |    2 +-
 src/brasero-audio-disc.h                     |    4 ++--
 src/brasero-data-disc.c                      |    4 ++--
 src/brasero-data-disc.h                      |    4 ++--
 src/brasero-eject-dialog.c                   |    2 +-
 src/brasero-file-chooser.c                   |    2 +-
 src/brasero-file-filtered.c                  |    6 +++---
 src/brasero-filter-option.c                  |    2 +-
 src/brasero-filter-option.h                  |    4 ++--
 src/brasero-layout.c                         |   12 ++++++------
 src/brasero-layout.h                         |    4 ++--
 src/brasero-multi-song-props.c               |    2 +-
 src/brasero-player.c                         |    4 ++--
 src/brasero-playlist.c                       |    4 ++--
 src/brasero-playlist.h                       |    4 ++--
 src/brasero-plugin-manager-ui.c              |    8 ++++----
 src/brasero-plugin-manager-ui.h              |    4 ++--
 src/brasero-plugin-option.c                  |   12 ++++++------
 src/brasero-project-type-chooser.c           |   16 ++++++++--------
 src/brasero-project-type-chooser.h           |    4 ++--
 src/brasero-project.c                        |    2 +-
 src/brasero-project.h                        |    4 ++--
 src/brasero-rename.c                         |   10 +++++-----
 src/brasero-rename.h                         |    4 ++--
 src/brasero-song-control.c                   |    8 ++++----
 src/brasero-split-dialog.c                   |   12 ++++++------
 src/brasero-time-button.c                    |    2 +-
 src/brasero-time-button.h                    |    4 ++--
 src/brasero-video-disc.c                     |    4 ++--
 src/brasero-video-disc.h                     |    4 ++--
 54 files changed, 129 insertions(+), 129 deletions(-)
---
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index 8a7c22c..63054df 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -2537,11 +2537,11 @@ brasero_burn_dialog_init (BraseroBurnDialog * obj)
 			    TRUE,
 			    0);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (alignment), vbox);
 
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	box = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (box);
 	gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
 
diff --git a/libbrasero-burn/brasero-burn-options.c b/libbrasero-burn/brasero-burn-options.c
index 9ae38ab..a25a7bc 100644
--- a/libbrasero-burn/brasero-burn-options.c
+++ b/libbrasero-burn/brasero-burn-options.c
@@ -127,7 +127,7 @@ brasero_burn_options_add_source (BraseroBurnOptions *self,
 		GtkWidget *hbox;
 		GtkWidget *alignment;
 
-		hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+		hbox = gtk_hbox_new (FALSE, 12);
 		gtk_widget_show (hbox);
 
 		gtk_box_pack_start (GTK_BOX (hbox), child, TRUE, TRUE, 0);
@@ -619,7 +619,7 @@ brasero_burn_options_build_contents (BraseroBurnOptions *object)
 			    0);
 
 	/* Medium selection box */
-	selection = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	selection = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (selection);
 
 	alignment = gtk_alignment_new (0.0, 0.5, 1.0, 1.0);
@@ -671,7 +671,7 @@ brasero_burn_options_build_contents (BraseroBurnOptions *object)
 			    0);
 	priv->options_placeholder = alignment;
 
-	priv->options = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	priv->options = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (alignment), priv->options);
 
 	g_signal_connect (priv->session,
@@ -706,7 +706,7 @@ brasero_burn_options_reset (BraseroBurnOptions *self)
 		priv->options = NULL;
 	}
 
-	priv->options = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	priv->options = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (priv->options_placeholder), priv->options);
 
 	if (priv->source) {
diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c
index 6b079f4..edca3ce 100644
--- a/libbrasero-burn/brasero-drive-properties.c
+++ b/libbrasero-burn/brasero-drive-properties.c
@@ -697,7 +697,7 @@ brasero_drive_properties_init (BraseroDriveProperties *object)
 
 	priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (object);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (object), vbox);
 
@@ -772,7 +772,7 @@ brasero_drive_properties_init (BraseroDriveProperties *object)
 	image = gtk_image_new_from_icon_name ("folder", GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show (image);
 
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	box = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (box);
 	gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
@@ -782,7 +782,7 @@ brasero_drive_properties_init (BraseroDriveProperties *object)
 	gtk_container_add (GTK_CONTAINER (button), box);
 	gtk_widget_set_tooltip_text (button, _("Set the directory where to store temporary files"));
 
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	box = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (box);
 
 	string = g_strdup_printf ("<b>%s</b>", _("Temporary files"));
diff --git a/libbrasero-burn/brasero-image-properties.c b/libbrasero-burn/brasero-image-properties.c
index 3310bb5..2330d13 100644
--- a/libbrasero-burn/brasero-image-properties.c
+++ b/libbrasero-burn/brasero-image-properties.c
@@ -230,7 +230,7 @@ brasero_image_properties_set_formats (BraseroImageProperties *self,
 		GtkWidget *label;
 		GtkWidget *dialog_box;
 
-		box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+		box = gtk_hbox_new (FALSE, 6);
 		gtk_container_set_border_width (GTK_CONTAINER (box), 4);
 
 		dialog_box = gtk_dialog_get_content_area (GTK_DIALOG (self));
diff --git a/libbrasero-burn/brasero-image-type-chooser.c b/libbrasero-burn/brasero-image-type-chooser.c
index 3c06e8c..fd80787 100644
--- a/libbrasero-burn/brasero-image-type-chooser.c
+++ b/libbrasero-burn/brasero-image-type-chooser.c
@@ -43,7 +43,7 @@
 
 #define BRASERO_IMAGE_TYPE_CHOOSER_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_IMAGE_TYPE_CHOOSER, BraseroImageTypeChooserPrivate))
 
-G_DEFINE_TYPE (BraseroImageTypeChooser, brasero_image_type_chooser, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroImageTypeChooser, brasero_image_type_chooser, GTK_TYPE_HBOX);
 
 enum {
 	FORMAT_TEXT,
@@ -67,7 +67,7 @@ struct _BraseroImageTypeChooserPrivate {
 	guint updating:1;
 };
 
-static GtkBoxClass *parent_class = NULL;
+static GtkHBoxClass *parent_class = NULL;
 
 guint
 brasero_image_type_chooser_set_formats (BraseroImageTypeChooser *self,
diff --git a/libbrasero-burn/brasero-image-type-chooser.h b/libbrasero-burn/brasero-image-type-chooser.h
index 311c168..cc85128 100644
--- a/libbrasero-burn/brasero-image-type-chooser.h
+++ b/libbrasero-burn/brasero-image-type-chooser.h
@@ -50,11 +50,11 @@ typedef struct _BraseroImageTypeChooserPrivate BraseroImageTypeChooserPrivate;
 typedef struct _BraseroImageTypeChooserClass BraseroImageTypeChooserClass;
 
 struct _BraseroImageTypeChooser {
-	GtkBox parent;
+	GtkHBox parent;
 };
 
 struct _BraseroImageTypeChooserClass {
-	GtkBoxClass parent_class;
+	GtkHBoxClass parent_class;
 };
 
 GType brasero_image_type_chooser_get_type (void);
diff --git a/libbrasero-burn/brasero-progress.c b/libbrasero-burn/brasero-progress.c
index 3a1b63e..1027fe3 100644
--- a/libbrasero-burn/brasero-progress.c
+++ b/libbrasero-burn/brasero-progress.c
@@ -98,7 +98,7 @@ brasero_burn_progress_get_type ()
 			(GInstanceInitFunc)brasero_burn_progress_init,
 		};
 
-		type = g_type_register_static(GTK_TYPE_BOX, 
+		type = g_type_register_static(GTK_TYPE_VBOX, 
 					      "BraseroBurnProgress",
 					      &our_info,
 					      0);
@@ -308,13 +308,13 @@ brasero_burn_progress_init (BraseroBurnProgress *obj)
 	obj->priv = g_new0 (BraseroBurnProgressPrivate, 1);
 	gtk_box_set_spacing (GTK_BOX (obj), 2);
 
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	box = gtk_hbox_new (FALSE, 0);
 	obj->priv->progress = gtk_progress_bar_new ();
 	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (obj->priv->progress), " ");
 	gtk_box_pack_start (GTK_BOX (box), obj->priv->progress, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (obj), box, TRUE, TRUE, 2);
 
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 24);
+	box = gtk_hbox_new (FALSE, 24);
 	gtk_box_pack_start (GTK_BOX (obj), box, FALSE, FALSE, 0);
 
 	obj->priv->action = gtk_label_new (NULL);
diff --git a/libbrasero-burn/brasero-progress.h b/libbrasero-burn/brasero-progress.h
index c79a4fe..c2279f6 100644
--- a/libbrasero-burn/brasero-progress.h
+++ b/libbrasero-burn/brasero-progress.h
@@ -51,12 +51,12 @@ G_BEGIN_DECLS
 typedef struct BraseroBurnProgressPrivate BraseroBurnProgressPrivate;
 
 typedef struct {
-	GtkBox parent;
+	GtkVBox parent;
 	BraseroBurnProgressPrivate *priv;
 } BraseroBurnProgress;
 
 typedef struct {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 } BraseroBurnProgressClass;
 
 GType brasero_burn_progress_get_type (void);
diff --git a/libbrasero-burn/brasero-src-image.c b/libbrasero-burn/brasero-src-image.c
index cd4ceac..27be531 100644
--- a/libbrasero-burn/brasero-src-image.c
+++ b/libbrasero-burn/brasero-src-image.c
@@ -456,7 +456,7 @@ brasero_src_image_clicked (GtkButton *button)
 	gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (priv->file), filter);
 
 	/* add the type chooser to the dialog */
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	box = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (box);
 	gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (priv->file))),
 			  box,
@@ -564,7 +564,7 @@ brasero_src_image_init (BraseroSrcImage *object)
 	image = gtk_image_new_from_icon_name ("iso-image-new", GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show (image);
 
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	box = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (box);
 	gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
diff --git a/libbrasero-burn/brasero-status-dialog.c b/libbrasero-burn/brasero-status-dialog.c
index bac595d..b2c4e8a 100644
--- a/libbrasero-burn/brasero-status-dialog.c
+++ b/libbrasero-burn/brasero-status-dialog.c
@@ -427,7 +427,7 @@ brasero_status_dialog_init (BraseroStatusDialog *object)
 			       GTK_STOCK_CANCEL,
 			       GTK_RESPONSE_CANCEL);
 
-	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+	box = gtk_vbox_new (FALSE, 4);
 	gtk_widget_show (box);
 	main_box = gtk_dialog_get_content_area (GTK_DIALOG (object));
 	gtk_box_pack_end (GTK_BOX (main_box),
diff --git a/libbrasero-burn/brasero-sum-dialog.c b/libbrasero-burn/brasero-sum-dialog.c
index 11d08ae..dd24778 100644
--- a/libbrasero-burn/brasero-sum-dialog.c
+++ b/libbrasero-burn/brasero-sum-dialog.c
@@ -687,7 +687,7 @@ brasero_sum_dialog_init (BraseroSumDialog *obj)
 
 	priv->session = brasero_burn_session_new ();
 
-	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	box = gtk_vbox_new (FALSE, 6);
 
 	priv->md5_check = gtk_check_button_new_with_mnemonic (_("Use an _MD5 file to check the disc"));
 	gtk_widget_set_tooltip_text (priv->md5_check, _("Use an external .md5 file that stores the checksum of a disc"));
diff --git a/libbrasero-burn/brasero-tool-dialog.c b/libbrasero-burn/brasero-tool-dialog.c
index c7dc681..07a15bd 100644
--- a/libbrasero-burn/brasero-tool-dialog.c
+++ b/libbrasero-burn/brasero-tool-dialog.c
@@ -530,7 +530,7 @@ brasero_tool_dialog_init (BraseroToolDialog *obj)
 	priv = BRASERO_TOOL_DIALOG_PRIVATE (obj);
 
 	/* upper part */
-	priv->upper_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	priv->upper_box = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (GTK_WIDGET (priv->upper_box));
 
 	priv->selector = brasero_medium_selection_new ();
@@ -558,7 +558,7 @@ brasero_tool_dialog_init (BraseroToolDialog *obj)
 			    0);
 
 	/* lower part */
-	priv->lower_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	priv->lower_box = gtk_vbox_new (FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (priv->lower_box), 12);
 	gtk_widget_set_sensitive (priv->lower_box, FALSE);
 	gtk_widget_show (priv->lower_box);
diff --git a/libbrasero-burn/brasero-video-options.c b/libbrasero-burn/brasero-video-options.c
index eb64a9e..5666d28 100644
--- a/libbrasero-burn/brasero-video-options.c
+++ b/libbrasero-burn/brasero-video-options.c
@@ -437,7 +437,7 @@ brasero_video_options_init (BraseroVideoOptions *object)
 	priv = BRASERO_VIDEO_OPTIONS_PRIVATE (object);
 
 	gtk_container_set_border_width (GTK_CONTAINER (object), 6);
-	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	widget = gtk_vbox_new (FALSE, 0);
 
 	table = gtk_table_new (3, 4, FALSE);
 	gtk_table_set_col_spacings (GTK_TABLE (table), 8);
diff --git a/libbrasero-utils/brasero-disc-message.c b/libbrasero-utils/brasero-disc-message.c
index 5cf09bf..87b8cc5 100644
--- a/libbrasero-utils/brasero-disc-message.c
+++ b/libbrasero-utils/brasero-disc-message.c
@@ -346,7 +346,7 @@ brasero_disc_message_init (BraseroDiscMessage *object)
 
 	main_box = gtk_info_bar_get_content_area (GTK_INFO_BAR (object));
 
-	priv->text_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	priv->text_box = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (priv->text_box);
 	gtk_box_pack_start (GTK_BOX (main_box), priv->text_box, FALSE, FALSE, 0);
 
diff --git a/libbrasero-utils/brasero-jacket-background.c b/libbrasero-utils/brasero-jacket-background.c
index f98051c..bfb445c 100644
--- a/libbrasero-utils/brasero-jacket-background.c
+++ b/libbrasero-utils/brasero-jacket-background.c
@@ -222,7 +222,7 @@ brasero_jacket_background_init (BraseroJacketBackground *object)
 
 	priv = BRASERO_JACKET_BACKGROUND_PRIVATE (object);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 	gtk_widget_show (vbox);
 	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (object))), vbox, TRUE, TRUE, 0);
@@ -233,7 +233,7 @@ brasero_jacket_background_init (BraseroJacketBackground *object)
 	gtk_widget_show (radio);
 	gtk_box_pack_start (GTK_BOX (vbox), radio, FALSE, TRUE, 0);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
@@ -247,11 +247,11 @@ brasero_jacket_background_init (BraseroJacketBackground *object)
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 
-	vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	vbox2 = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, TRUE, 0);
 
-	hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	hbox2 = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, TRUE, 0);
 
@@ -283,7 +283,7 @@ brasero_jacket_background_init (BraseroJacketBackground *object)
 	gtk_widget_show (radio);
 	gtk_box_pack_start (GTK_BOX (vbox), radio, FALSE, TRUE, 0);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
 	gtk_widget_set_sensitive (hbox, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
diff --git a/libbrasero-utils/brasero-jacket-edit.c b/libbrasero-utils/brasero-jacket-edit.c
index 1f46931..4f222ba 100644
--- a/libbrasero-utils/brasero-jacket-edit.c
+++ b/libbrasero-utils/brasero-jacket-edit.c
@@ -76,7 +76,7 @@ enum {
 	SNAP_NUM_COL
 };
 
-G_DEFINE_TYPE (BraseroJacketEdit, brasero_jacket_edit, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroJacketEdit, brasero_jacket_edit, GTK_TYPE_VBOX);
 
 static void
 brasero_jacket_edit_print_page (GtkPrintOperation *operation,
@@ -712,7 +712,7 @@ brasero_jacket_edit_init (BraseroJacketEdit *object)
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (priv->colours), 1);
 
 	/* contents */
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+	vbox = gtk_vbox_new (FALSE, 4);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
 	gtk_widget_show (vbox);
 	gtk_box_pack_start (GTK_BOX (object), vbox, TRUE, TRUE, 0);
@@ -724,7 +724,7 @@ brasero_jacket_edit_init (BraseroJacketEdit *object)
 	gtk_widget_show (scroll);
 	gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
 
-	main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	main_box = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (main_box);
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), main_box);
 
diff --git a/libbrasero-utils/brasero-jacket-edit.h b/libbrasero-utils/brasero-jacket-edit.h
index 5a90349..5e79f67 100644
--- a/libbrasero-utils/brasero-jacket-edit.h
+++ b/libbrasero-utils/brasero-jacket-edit.h
@@ -51,12 +51,12 @@ typedef struct _BraseroJacketEdit BraseroJacketEdit;
 
 struct _BraseroJacketEditClass
 {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 };
 
 struct _BraseroJacketEdit
 {
-	GtkBox parent_instance;
+	GtkVBox parent_instance;
 };
 
 GType brasero_jacket_edit_get_type (void) G_GNUC_CONST;
diff --git a/libbrasero-utils/brasero-jacket-font.c b/libbrasero-utils/brasero-jacket-font.c
index f135fca..196ae28 100644
--- a/libbrasero-utils/brasero-jacket-font.c
+++ b/libbrasero-utils/brasero-jacket-font.c
@@ -73,7 +73,7 @@ static const guint16 font_sizes[] = {
 
 static guint jacket_font_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (BraseroJacketFont, brasero_jacket_font, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroJacketFont, brasero_jacket_font, GTK_TYPE_HBOX);
 
 static void
 brasero_jacket_font_family_changed_cb (GtkComboBox *combo,
diff --git a/libbrasero-utils/brasero-jacket-font.h b/libbrasero-utils/brasero-jacket-font.h
index a562fb3..274faa4 100644
--- a/libbrasero-utils/brasero-jacket-font.h
+++ b/libbrasero-utils/brasero-jacket-font.h
@@ -49,12 +49,12 @@ typedef struct _BraseroJacketFont BraseroJacketFont;
 
 struct _BraseroJacketFontClass
 {
-	GtkBoxClass parent_class;
+	GtkHBoxClass parent_class;
 };
 
 struct _BraseroJacketFont
 {
-	GtkBox parent_instance;
+	GtkHBox parent_instance;
 };
 
 GType brasero_jacket_font_get_type (void) G_GNUC_CONST;
diff --git a/libbrasero-utils/brasero-misc.c b/libbrasero-utils/brasero-misc.c
index 9b6180f..65c5f83 100644
--- a/libbrasero-utils/brasero-misc.c
+++ b/libbrasero-utils/brasero-misc.c
@@ -298,10 +298,10 @@ brasero_utils_pack_properties_list (const gchar *title, GSList *list)
 	GtkWidget *label;
 	GSList *iter;
 
-	vbox_main = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	vbox_main = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox_main);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
 	gtk_box_pack_end (GTK_BOX (vbox_main),
 			  hbox,
@@ -317,7 +317,7 @@ brasero_utils_pack_properties_list (const gchar *title, GSList *list)
 			    TRUE,
 			    0);
 
-	vbox_prop = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	vbox_prop = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox_prop);
 	gtk_box_pack_start (GTK_BOX (hbox),
 			    vbox_prop,
@@ -336,7 +336,7 @@ brasero_utils_pack_properties_list (const gchar *title, GSList *list)
 		GtkWidget *vbox;
 		GtkWidget *label;
 
-		vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+		vbox = gtk_vbox_new (FALSE, 0);
 
 		label = gtk_label_new (title);
 		gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
diff --git a/libbrasero-utils/brasero-notify.c b/libbrasero-utils/brasero-notify.c
index de304cd..3782050 100644
--- a/libbrasero-utils/brasero-notify.c
+++ b/libbrasero-utils/brasero-notify.c
@@ -123,5 +123,5 @@ brasero_notify_message_add (GtkWidget *self,
 GtkWidget *
 brasero_notify_new (void)
 {
-	return gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	return gtk_vbox_new (TRUE, 0);
 }
diff --git a/nautilus/nautilus-burn-bar.c b/nautilus/nautilus-burn-bar.c
index 8344e5d..148e761 100644
--- a/nautilus/nautilus-burn-bar.c
+++ b/nautilus/nautilus-burn-bar.c
@@ -50,7 +50,7 @@ enum {
 
 static guint           signals [LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (NautilusDiscBurnBar, nautilus_disc_burn_bar, GTK_TYPE_BOX)
+G_DEFINE_TYPE (NautilusDiscBurnBar, nautilus_disc_burn_bar, GTK_TYPE_HBOX)
 
 const gchar *
 nautilus_disc_burn_bar_get_icon (NautilusDiscBurnBar *bar)
diff --git a/nautilus/nautilus-burn-bar.h b/nautilus/nautilus-burn-bar.h
index e63e484..f6f6200 100644
--- a/nautilus/nautilus-burn-bar.h
+++ b/nautilus/nautilus-burn-bar.h
@@ -38,13 +38,13 @@ typedef struct NautilusDiscBurnBarPrivate NautilusDiscBurnBarPrivate;
 
 typedef struct
 {
-        GtkBox                     box;
+        GtkHBox                     box;
         NautilusDiscBurnBarPrivate *priv;
 } NautilusDiscBurnBar;
 
 typedef struct
 {
-        GtkBoxClass          parent_class;
+        GtkHBoxClass          parent_class;
 
 	void (* title_changed) (NautilusDiscBurnBar *bar);
 	void (* icon_changed)  (NautilusDiscBurnBar *bar);
diff --git a/src/brasero-app.c b/src/brasero-app.c
index 7e1ab70..ae88be3 100644
--- a/src/brasero-app.c
+++ b/src/brasero-app.c
@@ -1888,7 +1888,7 @@ brasero_app_create_mainwin (BraseroApp *app)
 			  app);
 
 	/* contents */
-	priv->contents = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	priv->contents = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (priv->contents);
 
 	gtk_container_add (GTK_CONTAINER (priv->mainwin), priv->contents);
@@ -1930,7 +1930,7 @@ brasero_app_create_mainwin (BraseroApp *app)
 	gtk_box_pack_start (GTK_BOX (priv->contents), priv->projects, TRUE, TRUE, 0);
 
 	/* status bar to display the size of selected files */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	hbox = gtk_hbox_new (TRUE, 0);
 	gtk_widget_show (hbox);
 	gtk_box_pack_end (GTK_BOX (priv->contents), hbox, FALSE, TRUE, 0);
 
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index 3966549..6227c89 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -229,7 +229,7 @@ static void brasero_audio_disc_iface_disc_init (BraseroDiscIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (BraseroAudioDisc,
 			 brasero_audio_disc,
-			 GTK_TYPE_BOX,
+			 GTK_TYPE_VBOX,
 			 G_IMPLEMENT_INTERFACE (BRASERO_TYPE_DISC,
 					        brasero_audio_disc_iface_disc_init));
 static gboolean
diff --git a/src/brasero-audio-disc.h b/src/brasero-audio-disc.h
index 0694244..b1039f4 100644
--- a/src/brasero-audio-disc.h
+++ b/src/brasero-audio-disc.h
@@ -44,12 +44,12 @@ G_BEGIN_DECLS
 typedef struct _BraseroAudioDiscPrivate BraseroAudioDiscPrivate;
 
 typedef struct {
-	GtkBox parent;
+	GtkVBox parent;
 	BraseroAudioDiscPrivate *priv;
 } BraseroAudioDisc;
 
 typedef struct {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 } BraseroAudioDiscClass;
 
 GType brasero_audio_disc_get_type (void);
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 9e2e5a4..b3db0d4 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -185,7 +185,7 @@ brasero_data_disc_iface_disc_init (BraseroDiscIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (BraseroDataDisc,
 			 brasero_data_disc,
-			 GTK_TYPE_BOX,
+			 GTK_TYPE_VBOX,
 			 G_IMPLEMENT_INTERFACE (BRASERO_TYPE_DISC,
 					        brasero_data_disc_iface_disc_init));
 
@@ -2265,7 +2265,7 @@ brasero_data_disc_init (BraseroDataDisc *object)
 
 	gtk_box_set_spacing (GTK_BOX (object), 8);
 
-	mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	mainbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (mainbox);
 	gtk_box_pack_start (GTK_BOX (object), mainbox, TRUE, TRUE, 0);
 
diff --git a/src/brasero-data-disc.h b/src/brasero-data-disc.h
index ac7b78e..b640bb7 100644
--- a/src/brasero-data-disc.h
+++ b/src/brasero-data-disc.h
@@ -43,12 +43,12 @@ typedef struct _BraseroDataDisc BraseroDataDisc;
 
 struct _BraseroDataDiscClass
 {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 };
 
 struct _BraseroDataDisc
 {
-	GtkBox parent_instance;
+	GtkVBox parent_instance;
 };
 
 GType brasero_data_disc_get_type (void) G_GNUC_CONST;
diff --git a/src/brasero-eject-dialog.c b/src/brasero-eject-dialog.c
index b3008e8..09b3469 100644
--- a/src/brasero-eject-dialog.c
+++ b/src/brasero-eject-dialog.c
@@ -167,7 +167,7 @@ brasero_eject_dialog_init (BraseroEjectDialog *obj)
 	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 	gtk_widget_show (label);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+	hbox = gtk_hbox_new (FALSE, 8);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, TRUE, 0);
diff --git a/src/brasero-file-chooser.c b/src/brasero-file-chooser.c
index 8f2fbe2..5eba040 100644
--- a/src/brasero-file-chooser.c
+++ b/src/brasero-file-chooser.c
@@ -415,7 +415,7 @@ brasero_file_chooser_find_pane (GtkWidget *child,
 		vbox = gtk_paned_get_child2 (GTK_PANED (child));
 		children_vbox = gtk_container_get_children (GTK_CONTAINER (vbox));
 		for (iter_vbox = children_vbox; iter_vbox; iter_vbox = iter_vbox->next) {
-			if (GTK_IS_BOX (iter_vbox->data)) {
+			if (GTK_IS_HBOX (iter_vbox->data)) {
 				GtkPackType packing;
 
 				gtk_box_query_child_packing (GTK_BOX (vbox),
diff --git a/src/brasero-file-filtered.c b/src/brasero-file-filtered.c
index 06472c3..677f60c 100644
--- a/src/brasero-file-filtered.c
+++ b/src/brasero-file-filtered.c
@@ -217,11 +217,11 @@ brasero_file_filtered_init (BraseroFileFiltered *object)
 
 	gtk_widget_set_tooltip_text (GTK_WIDGET (object), _("Select the files you want to restore and click on the \"Restore\" button"));
 
-	mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+	mainbox = gtk_vbox_new (FALSE, 10);
 	gtk_widget_show (mainbox);
 	gtk_container_add (GTK_CONTAINER (object), mainbox);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 
 	priv->tree = gtk_tree_view_new ();
@@ -285,7 +285,7 @@ brasero_file_filtered_init (BraseroFileFiltered *object)
 			    TRUE,
 			    0);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
 
diff --git a/src/brasero-filter-option.c b/src/brasero-filter-option.c
index 97fb173..c2d49bc 100644
--- a/src/brasero-filter-option.c
+++ b/src/brasero-filter-option.c
@@ -43,7 +43,7 @@ struct _BraseroFilterOptionPrivate
 
 #define BRASERO_FILTER_OPTION_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_FILTER_OPTION, BraseroFilterOptionPrivate))
 
-G_DEFINE_TYPE (BraseroFilterOption, brasero_filter_option, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroFilterOption, brasero_filter_option, GTK_TYPE_VBOX);
 
 static void
 brasero_filter_option_init (BraseroFilterOption *object)
diff --git a/src/brasero-filter-option.h b/src/brasero-filter-option.h
index 735665b..cac3b8b 100644
--- a/src/brasero-filter-option.h
+++ b/src/brasero-filter-option.h
@@ -41,12 +41,12 @@ typedef struct _BraseroFilterOption BraseroFilterOption;
 
 struct _BraseroFilterOptionClass
 {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 };
 
 struct _BraseroFilterOption
 {
-	GtkBox parent_instance;
+	GtkVBox parent_instance;
 };
 
 GType brasero_filter_option_get_type (void) G_GNUC_CONST;
diff --git a/src/brasero-layout.c b/src/brasero-layout.c
index cbe3668..edf9818 100644
--- a/src/brasero-layout.c
+++ b/src/brasero-layout.c
@@ -44,7 +44,7 @@
 #include "brasero-uri-container.h"
 #include "brasero-layout-object.h"
 
-G_DEFINE_TYPE (BraseroLayout, brasero_layout, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroLayout, brasero_layout, GTK_TYPE_VBOX);
 
 enum {
 	TEXT_COL,
@@ -514,7 +514,7 @@ brasero_layout_add_source (BraseroLayout *layout,
 	GtkTreeModel *model;
 	BraseroLayoutItem *item;
 
-	pane = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+	pane = gtk_vbox_new (FALSE, 1);
 	gtk_widget_hide (pane);
 	gtk_box_pack_end (GTK_BOX (pane), source, TRUE, TRUE, 0);
 	g_signal_connect (pane,
@@ -1096,12 +1096,12 @@ brasero_layout_init (BraseroLayout *obj)
 	gtk_action_group_add_radio_actions (obj->priv->action_group,
 					    radio_entries,
 					    sizeof (radio_entries) / sizeof (GtkRadioActionEntry),
-					    GTK_IS_PANED (obj->priv->pane),
+					    GTK_IS_VPANED (obj->priv->pane),
 					    G_CALLBACK (brasero_layout_HV_radio_button_toggled_cb),
 					    obj);
 
 	/* set up pane for project */
-	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	box = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (box);
 
 	if (obj->priv->layout_type == BRASERO_LAYOUT_TOP
@@ -1120,12 +1120,12 @@ brasero_layout_init (BraseroLayout *obj)
 	else
 		gtk_paned_pack1 (GTK_PANED (obj->priv->pane), alignment, TRUE, TRUE);
 
-	obj->priv->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	obj->priv->main_box = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (alignment), obj->priv->main_box);
 	gtk_widget_show (obj->priv->main_box);
 
 	/* close button and combo. Don't show it now. */
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	box = gtk_hbox_new (FALSE, 6);
 	obj->priv->top_box = box;
 	gtk_box_pack_start (GTK_BOX (obj->priv->main_box),
 			    box,
diff --git a/src/brasero-layout.h b/src/brasero-layout.h
index 516f4d4..31c85bc 100644
--- a/src/brasero-layout.h
+++ b/src/brasero-layout.h
@@ -55,12 +55,12 @@ typedef enum {
 } BraseroLayoutType;
 
 typedef struct {
-	GtkPaned parent;
+	GtkHPaned parent;
 	BraseroLayoutPrivate *priv;
 } BraseroLayout;
 
 typedef struct {
-	GtkPanedClass parent_class;
+	GtkHPanedClass parent_class;
 } BraseroLayoutClass;
 
 GType brasero_layout_get_type (void);
diff --git a/src/brasero-multi-song-props.c b/src/brasero-multi-song-props.c
index be2704e..ea9a9bb 100644
--- a/src/brasero-multi-song-props.c
+++ b/src/brasero-multi-song-props.c
@@ -302,7 +302,7 @@ brasero_multi_song_props_init (BraseroMultiSongProps *object)
 			  NULL);
 
 	/* second part of the dialog */
-	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	box = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (box);
 
 	title = g_strdup_printf ("<b>%s</b>", _("Options"));
diff --git a/src/brasero-player.c b/src/brasero-player.c
index 0e408be..c738539 100644
--- a/src/brasero-player.c
+++ b/src/brasero-player.c
@@ -785,7 +785,7 @@ brasero_player_init (BraseroPlayer *obj)
 
 	gtk_alignment_set (GTK_ALIGNMENT (obj), 0.5, 0.5, 0.0, 0.0);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+	vbox = gtk_vbox_new (FALSE, 2);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (obj), vbox);
 	
@@ -910,7 +910,7 @@ brasero_player_init (BraseroPlayer *obj)
 				     obj->priv->video_height);
 
 	/* A few controls */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
diff --git a/src/brasero-playlist.c b/src/brasero-playlist.c
index dc38f5f..ed04175 100644
--- a/src/brasero-playlist.c
+++ b/src/brasero-playlist.c
@@ -96,7 +96,7 @@ static void brasero_playlist_iface_layout_object_init (BraseroLayoutObjectIFace
 
 G_DEFINE_TYPE_WITH_CODE (BraseroPlaylist,
 			 brasero_playlist,
-			 GTK_TYPE_BOX,
+			 GTK_TYPE_VBOX,
 			 G_IMPLEMENT_INTERFACE (BRASERO_TYPE_URI_CONTAINER,
 					        brasero_playlist_iface_uri_container_init)
 			 G_IMPLEMENT_INTERFACE (BRASERO_TYPE_LAYOUT_OBJECT,
@@ -698,7 +698,7 @@ brasero_playlist_init (BraseroPlaylist *obj)
 	obj->priv = g_new0 (BraseroPlaylistPrivate, 1);
 	gtk_box_set_spacing (GTK_BOX (obj), BRASERO_PLAYLIST_SPACING);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+	hbox = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (hbox);
 
 	obj->priv->button_add = gtk_button_new_from_stock (GTK_STOCK_ADD);
diff --git a/src/brasero-playlist.h b/src/brasero-playlist.h
index 0a81511..bbe3f2f 100644
--- a/src/brasero-playlist.h
+++ b/src/brasero-playlist.h
@@ -47,12 +47,12 @@ G_BEGIN_DECLS
 typedef struct BraseroPlaylistPrivate BraseroPlaylistPrivate;
 
 typedef struct {
-	GtkBox parent;
+	GtkVBox parent;
 	BraseroPlaylistPrivate *priv;
 } BraseroPlaylist;
 
 typedef struct {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 } BraseroPlaylistClass;
 
 GType brasero_playlist_get_type (void);
diff --git a/src/brasero-plugin-manager-ui.c b/src/brasero-plugin-manager-ui.c
index fb305bb..67a87ca 100644
--- a/src/brasero-plugin-manager-ui.c
+++ b/src/brasero-plugin-manager-ui.c
@@ -78,7 +78,7 @@ struct _BraseroPluginManagerUIPrivate
 	GSList		*plugins;
 };
 
-G_DEFINE_TYPE (BraseroPluginManagerUI, brasero_plugin_manager_ui, GTK_TYPE_BOX)
+G_DEFINE_TYPE (BraseroPluginManagerUI, brasero_plugin_manager_ui, GTK_TYPE_VBOX)
 
 static void plugin_manager_ui_toggle_active (GtkTreeIter *iter, GtkTreeModel *model); 
 static void brasero_plugin_manager_ui_finalize (GObject *object);
@@ -937,12 +937,12 @@ brasero_plugin_manager_ui_init (BraseroPluginManagerUI *pm)
 	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
 	gtk_box_pack_start (GTK_BOX (pm), alignment, TRUE, TRUE, 0);
  	
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (alignment), vbox);
 
 	/* bottom part: tree, buttons */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 6);
 
@@ -958,7 +958,7 @@ brasero_plugin_manager_ui_init (BraseroPluginManagerUI *pm)
 	priv->tree = gtk_tree_view_new ();
 	gtk_container_add (GTK_CONTAINER (viewport), priv->tree);
 
-	vbuttonbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
+	vbuttonbox = gtk_vbutton_box_new ();
 	gtk_box_pack_start (GTK_BOX (hbox), vbuttonbox, FALSE, FALSE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox), GTK_BUTTONBOX_START);
 	gtk_box_set_spacing (GTK_BOX (vbuttonbox), 8);
diff --git a/src/brasero-plugin-manager-ui.h b/src/brasero-plugin-manager-ui.h
index d1c56fc..4bc5414 100644
--- a/src/brasero-plugin-manager-ui.h
+++ b/src/brasero-plugin-manager-ui.h
@@ -52,7 +52,7 @@ typedef struct _BraseroPluginManagerUI BraseroPluginManagerUI;
 
 struct _BraseroPluginManagerUI 
 {
-	GtkBox vbox;
+	GtkVBox vbox;
 };
 
 /*
@@ -62,7 +62,7 @@ typedef struct _BraseroPluginManagerUIClass BraseroPluginManagerUIClass;
 
 struct _BraseroPluginManagerUIClass 
 {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 };
 
 /*
diff --git a/src/brasero-plugin-option.c b/src/brasero-plugin-option.c
index 4e3bdca..7b7b49b 100644
--- a/src/brasero-plugin-option.c
+++ b/src/brasero-plugin-option.c
@@ -80,7 +80,7 @@ brasero_plugin_option_add_conf_widget (BraseroPluginOption *self,
 					     &description,
 					     &type);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (container, hbox, FALSE, FALSE, 0);
 
@@ -100,7 +100,7 @@ brasero_plugin_option_add_conf_widget (BraseroPluginOption *self,
 
 		suboptions = brasero_plugin_conf_option_bool_get_suboptions (option);
 		if (suboptions) {
-			box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+			box = gtk_vbox_new (FALSE, 0);
 			gtk_widget_show (box);
 
 			gtk_box_pack_start (GTK_BOX (box),
@@ -136,7 +136,7 @@ brasero_plugin_option_add_conf_widget (BraseroPluginOption *self,
 		break;
 
 	case BRASERO_PLUGIN_OPTION_INT:
-		box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+		box = gtk_hbox_new (FALSE, 6);
 
 		label = gtk_label_new (description);
 		gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
@@ -160,7 +160,7 @@ brasero_plugin_option_add_conf_widget (BraseroPluginOption *self,
 		break;
 
 	case BRASERO_PLUGIN_OPTION_STRING:
-		box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+		box = gtk_hbox_new (FALSE, 6);
 
 		label = gtk_label_new (description);
 		gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
@@ -182,7 +182,7 @@ brasero_plugin_option_add_conf_widget (BraseroPluginOption *self,
 		break;
 
 	case BRASERO_PLUGIN_OPTION_CHOICE:
-		box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+		box = gtk_hbox_new (FALSE, 6);
 
 		label = gtk_label_new (description);
 		gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
@@ -285,7 +285,7 @@ brasero_plugin_option_init (BraseroPluginOption *object)
 	priv->title = gtk_frame_get_label_widget (GTK_FRAME (frame));
 	gtk_label_set_use_markup (GTK_LABEL (priv->title), TRUE);
 
-	priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	priv->vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (priv->vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (priv->vbox), 8);
 	gtk_container_add (GTK_CONTAINER (frame), priv->vbox);
diff --git a/src/brasero-project-type-chooser.c b/src/brasero-project-type-chooser.c
index 3707be7..80bb551 100644
--- a/src/brasero-project-type-chooser.c
+++ b/src/brasero-project-type-chooser.c
@@ -44,7 +44,7 @@
 
 #include "brasero-project-type-chooser.h"
 
-G_DEFINE_TYPE (BraseroProjectTypeChooser, brasero_project_type_chooser, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroProjectTypeChooser, brasero_project_type_chooser, GTK_TYPE_HBOX);
 
 typedef enum {
 	LAST_SAVED_CLICKED_SIGNAL,
@@ -149,18 +149,18 @@ brasero_project_type_chooser_new_item (BraseroProjectTypeChooser *chooser,
 			   DESCRIPTION_KEY,
 			   description);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
 	gtk_container_add (GTK_CONTAINER (eventbox), vbox);
 
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+	hbox = gtk_hbox_new (FALSE, 4);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0);
 
 	image = gtk_image_new_from_icon_name (description->image, GTK_ICON_SIZE_DIALOG);
 	gtk_misc_set_alignment (GTK_MISC (image), 1.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
+	vbox = gtk_vbox_new (TRUE, 4);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, TRUE, 0);
 
 	label = gtk_label_new (NULL);
@@ -456,7 +456,7 @@ brasero_project_type_chooser_init (BraseroProjectTypeChooser *obj)
 	obj->priv = g_new0 (BraseroProjectTypeChooserPrivate, 1);
 
 	/* Project box */
-	project_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	project_box = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (project_box);
 	gtk_box_pack_start (GTK_BOX (obj), project_box, FALSE, TRUE, 0);
 
@@ -497,12 +497,12 @@ brasero_project_type_chooser_init (BraseroProjectTypeChooser *obj)
 	}
 	gtk_widget_show_all (table);
 
-	separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+	separator = gtk_vseparator_new ();
 	gtk_widget_show (separator);
 	gtk_box_pack_start (GTK_BOX (obj), separator, FALSE, TRUE, 8);
 
 	/* The recent files part */
-	recent_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	recent_box = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (recent_box);
 	gtk_box_pack_start (GTK_BOX (obj), recent_box, TRUE, TRUE, 0);
 
@@ -515,7 +515,7 @@ brasero_project_type_chooser_init (BraseroProjectTypeChooser *obj)
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
 	gtk_box_pack_start (GTK_BOX (recent_box), label, FALSE, TRUE, 0);
 
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	vbox = gtk_vbox_new (TRUE, 0);
 	gtk_widget_show (vbox);
 	gtk_box_pack_start (GTK_BOX (recent_box), vbox, FALSE, TRUE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
diff --git a/src/brasero-project-type-chooser.h b/src/brasero-project-type-chooser.h
index b44941f..390eb69 100644
--- a/src/brasero-project-type-chooser.h
+++ b/src/brasero-project-type-chooser.h
@@ -46,12 +46,12 @@ G_BEGIN_DECLS
 typedef struct BraseroProjectTypeChooserPrivate BraseroProjectTypeChooserPrivate;
 
 typedef struct {
-	GtkBox parent;
+	GtkHBox parent;
 	BraseroProjectTypeChooserPrivate *priv;
 } BraseroProjectTypeChooser;
 
 typedef struct {
-	GtkBoxClass parent_class;
+	GtkHBoxClass parent_class;
 
 	void	(*last_saved_clicked)	(BraseroProjectTypeChooser *chooser,
 					 const gchar *path);
diff --git a/src/brasero-project.c b/src/brasero-project.c
index b280575..e77d274 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -295,7 +295,7 @@ brasero_project_get_type ()
 			NULL
 		};
 
-		type = g_type_register_static (GTK_TYPE_BOX, 
+		type = g_type_register_static (GTK_TYPE_VBOX, 
 					       "BraseroProject",
 					       &our_info, 0);
 
diff --git a/src/brasero-project.h b/src/brasero-project.h
index 9889a28..db241ad 100644
--- a/src/brasero-project.h
+++ b/src/brasero-project.h
@@ -53,12 +53,12 @@ G_BEGIN_DECLS
 typedef struct BraseroProjectPrivate BraseroProjectPrivate;
 
 typedef struct {
-	GtkBox parent;
+	GtkVBox parent;
 	BraseroProjectPrivate *priv;
 } BraseroProject;
 
 typedef struct {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 
 	void	(*add_pressed)	(BraseroProject *project);
 } BraseroProjectClass;
diff --git a/src/brasero-rename.c b/src/brasero-rename.c
index 58982e9..bf8f2c9 100644
--- a/src/brasero-rename.c
+++ b/src/brasero-rename.c
@@ -59,7 +59,7 @@ struct _BraseroRenamePrivate
 
 
 
-G_DEFINE_TYPE (BraseroRename, brasero_rename, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroRename, brasero_rename, GTK_TYPE_VBOX);
 
 void
 brasero_rename_set_show_keep_default (BraseroRename *self,
@@ -331,7 +331,7 @@ brasero_rename_init (BraseroRename *object)
 	gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combo), 0);
 
 	/* Insert */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox, NULL);
 
@@ -361,7 +361,7 @@ brasero_rename_init (BraseroRename *object)
 	priv->insert_combo = combo;
 
 	/* Delete */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox, NULL);
 
@@ -375,7 +375,7 @@ brasero_rename_init (BraseroRename *object)
 	priv->delete_entry = entry;
 
 	/* Substitution */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox, NULL);
 
@@ -405,7 +405,7 @@ brasero_rename_init (BraseroRename *object)
 	priv->joker_entry = entry;
 
 	/* Pattern */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox, NULL);
 
diff --git a/src/brasero-rename.h b/src/brasero-rename.h
index e2f41c5..2824e64 100644
--- a/src/brasero-rename.h
+++ b/src/brasero-rename.h
@@ -47,12 +47,12 @@ typedef struct _BraseroRename BraseroRename;
 
 struct _BraseroRenameClass
 {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 };
 
 struct _BraseroRename
 {
-	GtkBox parent_instance;
+	GtkVBox parent_instance;
 };
 
 GType brasero_rename_get_type (void) G_GNUC_CONST;
diff --git a/src/brasero-song-control.c b/src/brasero-song-control.c
index 06cf14f..a6c7305 100644
--- a/src/brasero-song-control.c
+++ b/src/brasero-song-control.c
@@ -511,13 +511,13 @@ brasero_song_control_init (BraseroSongControl *object)
 	gst_object_unref (bus);
 
 	/* Widget itself */
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
 	gtk_container_add (GTK_CONTAINER (object), vbox);
 
 	/* first line title */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox),
 			    hbox,
@@ -547,7 +547,7 @@ brasero_song_control_init (BraseroSongControl *object)
 	                  0);
 	
 	/* second line : play, progress, volume button */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox),
 			    hbox,
@@ -575,7 +575,7 @@ brasero_song_control_init (BraseroSongControl *object)
 			  G_CALLBACK (brasero_song_control_button_clicked_cb),
 			  object);
 
-	priv->progress = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 1, 500000000);
+	priv->progress = gtk_hscale_new_with_range (0, 1, 500000000);
 	gtk_widget_show (priv->progress);
 	gtk_scale_set_digits (GTK_SCALE (priv->progress), 0);
 	gtk_scale_set_draw_value (GTK_SCALE (priv->progress), FALSE);
diff --git a/src/brasero-split-dialog.c b/src/brasero-split-dialog.c
index 81bbf76..7dcf6fc 100644
--- a/src/brasero-split-dialog.c
+++ b/src/brasero-split-dialog.c
@@ -1058,7 +1058,7 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
 
 	/* Slicing method */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 
 	priv->combo = gtk_combo_box_text_new ();
@@ -1104,7 +1104,7 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	gtk_widget_show (priv->player);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), priv->player, NULL);
 
-	hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox2 = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox2);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox2, NULL);
 
@@ -1122,7 +1122,7 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
 
-	hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox2 = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox2);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox2, NULL);
 
@@ -1156,7 +1156,7 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	g_free (title);
 
 	/* slices preview */
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 
 	priv->model = gtk_list_store_new (COLUMN_NUM,
@@ -1228,7 +1228,7 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 			  object);
 
 	/* buttons */
-	vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	vbox2 = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, TRUE, 0);
 
@@ -1278,7 +1278,7 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	gtk_widget_set_sensitive (priv->merge_button, FALSE);
 	gtk_widget_set_sensitive (priv->remove_button, FALSE);
 
-	vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	vbox2 = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox2);
 
 	label = gtk_label_new_with_mnemonic (_("_List of slices that are to be created:"));
diff --git a/src/brasero-time-button.c b/src/brasero-time-button.c
index 4494797..6d3cc5e 100644
--- a/src/brasero-time-button.c
+++ b/src/brasero-time-button.c
@@ -55,7 +55,7 @@ enum
 };
 static guint time_button_signals [LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (BraseroTimeButton, brasero_time_button, GTK_TYPE_BOX);
+G_DEFINE_TYPE (BraseroTimeButton, brasero_time_button, GTK_TYPE_HBOX);
 
 static void
 brasero_time_button_hrs_changed (GtkSpinButton *button,
diff --git a/src/brasero-time-button.h b/src/brasero-time-button.h
index 3a77a30..0d42535 100644
--- a/src/brasero-time-button.h
+++ b/src/brasero-time-button.h
@@ -41,14 +41,14 @@ typedef struct _BraseroTimeButton BraseroTimeButton;
 
 struct _BraseroTimeButtonClass
 {
-	GtkBoxClass parent_class;
+	GtkHBoxClass parent_class;
 
 	void		(*value_changed)	(BraseroTimeButton *self);
 };
 
 struct _BraseroTimeButton
 {
-	GtkBox parent_instance;
+	GtkHBox parent_instance;
 };
 
 GType brasero_time_button_get_type (void) G_GNUC_CONST;
diff --git a/src/brasero-video-disc.c b/src/brasero-video-disc.c
index 2812fcf..3ecdfeb 100644
--- a/src/brasero-video-disc.c
+++ b/src/brasero-video-disc.c
@@ -74,7 +74,7 @@ brasero_video_disc_iface_disc_init (BraseroDiscIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (BraseroVideoDisc,
 			 brasero_video_disc,
-			 GTK_TYPE_BOX,
+			 GTK_TYPE_VBOX,
 			 G_IMPLEMENT_INTERFACE (BRASERO_TYPE_DISC,
 					        brasero_video_disc_iface_disc_init));
 
@@ -1152,7 +1152,7 @@ brasero_video_disc_init (BraseroVideoDisc *object)
 
 	priv = BRASERO_VIDEO_DISC_PRIVATE (object);
 
-	mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	mainbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (mainbox);
 	gtk_box_pack_start (GTK_BOX (object), mainbox, TRUE, TRUE, 0);
 
diff --git a/src/brasero-video-disc.h b/src/brasero-video-disc.h
index 81d8a20..d47aca8 100644
--- a/src/brasero-video-disc.h
+++ b/src/brasero-video-disc.h
@@ -41,12 +41,12 @@ typedef struct _BraseroVideoDisc BraseroVideoDisc;
 
 struct _BraseroVideoDiscClass
 {
-	GtkBoxClass parent_class;
+	GtkVBoxClass parent_class;
 };
 
 struct _BraseroVideoDisc
 {
-	GtkBox parent_instance;
+	GtkVBox parent_instance;
 };
 
 GType brasero_video_disc_get_type (void) G_GNUC_CONST;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]