applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sound: Stop using deprecated gtk_hbox_new/gtk_vbox_new

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=669619
This commit is contained in:
Robert Ancell 2012-02-08 12:11:32 +11:00 • committed by Bastien Nocera
parent 64bbbd6999
commit fb88ac92ba
6 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
panels/sound/gvc-balance-bar.c
View file

@ -89,7 +89,7 @@ _scale_box_new (GvcBalanceBar *bar)
char *str_lower, *str_upper;
gdouble lower, upper;
bar->priv->scale_box = box = gtk_hbox_new (FALSE, 6);
bar->priv->scale_box = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
priv->scale = gtk_hscale_new (priv->adjustment);
gtk_widget_set_size_request (priv->scale, SCALE_SIZE, -1);
@ -99,7 +99,7 @@ _scale_box_new (GvcBalanceBar *bar)
"}\n"
"widget \"*.balance-bar-scale\" style : rc \"balance-bar-scale-style\"\n");
bar->priv->start_box = sbox = gtk_hbox_new (FALSE, 6);
bar->priv->start_box = sbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
@ -138,7 +138,7 @@ _scale_box_new (GvcBalanceBar *bar)
GTK_POS_BOTTOM, NULL);
}
bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
bar->priv->end_box = ebox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
ca_gtk_widget_disable_sounds (bar->priv->scale, FALSE);

12
panels/sound/gvc-channel-bar.c
View file

@ -110,14 +110,14 @@ _scale_box_new (GvcChannelBar *bar)
GtkWidget *ebox;
if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
bar->priv->scale_box = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
priv->scale = gtk_vscale_new (priv->adjustment);
gtk_widget_set_size_request (priv->scale, -1, SCALE_SIZE);
gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
bar->priv->start_box = sbox = gtk_vbox_new (FALSE, 6);
bar->priv->start_box = sbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
@ -127,7 +127,7 @@ _scale_box_new (GvcChannelBar *bar)
gtk_widget_hide (priv->high_image);
gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
bar->priv->end_box = ebox = gtk_vbox_new (FALSE, 6);
bar->priv->end_box = ebox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (ebox), priv->low_image, FALSE, FALSE, 0);
@ -135,14 +135,14 @@ _scale_box_new (GvcChannelBar *bar)
gtk_box_pack_start (GTK_BOX (ebox), priv->mute_box, FALSE, FALSE, 0);
} else {
bar->priv->scale_box = box = gtk_hbox_new (FALSE, 6);
bar->priv->scale_box = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
priv->scale = gtk_hscale_new (priv->adjustment);
gtk_widget_set_size_request (priv->scale, SCALE_SIZE, -1);
bar->priv->start_box = sbox = gtk_hbox_new (FALSE, 6);
bar->priv->start_box = sbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (sbox), priv->low_image, FALSE, FALSE, 0);
@ -151,7 +151,7 @@ _scale_box_new (GvcChannelBar *bar)
gtk_box_pack_start (GTK_BOX (sbox), priv->label, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
bar->priv->end_box = ebox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (ebox), priv->high_image, FALSE, FALSE, 0);

6
panels/sound/gvc-combo-box.c
View file

@ -318,7 +318,7 @@ gvc_combo_box_init (GvcComboBox *combo_box)
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
gtk_container_add (GTK_CONTAINER (combo_box), frame);
combo_box->priv->drop_box = box = gtk_hbox_new (FALSE, 6);
combo_box->priv->drop_box = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
combo_box->priv->combobox = gtk_combo_box_new_with_model (combo_box->priv->model);
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box->priv->combobox),
@ -332,7 +332,7 @@ gvc_combo_box_init (GvcComboBox *combo_box)
g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
g_object_set (G_OBJECT (combo_box->priv->combobox), "popup-fixed-width", FALSE, NULL);
combo_box->priv->start_box = sbox = gtk_hbox_new (FALSE, 6);
combo_box->priv->start_box = sbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (sbox), combo_box->priv->label, FALSE, FALSE, 0);
@ -345,7 +345,7 @@ gvc_combo_box_init (GvcComboBox *combo_box)
gtk_box_pack_start (GTK_BOX (box), combo_box->priv->button, FALSE, FALSE, 0);
combo_box->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
combo_box->priv->end_box = ebox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
if (combo_box->priv->size_group != NULL) {

24
panels/sound/gvc-mixer-dialog.c
View file

@ -1742,7 +1742,7 @@ gvc_mixer_dialog_constructor (GType type,
gtk_container_set_border_width (GTK_CONTAINER (self), 6);
self->priv->output_stream_box = gtk_hbox_new (FALSE, 12);
self->priv->output_stream_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
alignment = gtk_alignment_new (0, 0, 1, 1);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 0, 0);
gtk_container_add (GTK_CONTAINER (alignment), self->priv->output_stream_box);
@ -1763,7 +1763,7 @@ gvc_mixer_dialog_constructor (GType type,
gtk_container_set_border_width (GTK_CONTAINER (self->priv->notebook), 5);
/* Output page */
self->priv->output_box = gtk_vbox_new (FALSE, 12);
self->priv->output_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (self->priv->output_box), 12);
label = gtk_label_new (_("Output"));
gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook),
@ -1800,11 +1800,11 @@ gvc_mixer_dialog_constructor (GType type,
_gtk_label_make_bold (GTK_LABEL (label));
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
gtk_box_pack_start (GTK_BOX (self->priv->output_box), box, FALSE, FALSE, 12);
self->priv->output_settings_box = gtk_vbox_new (FALSE, 0);
self->priv->output_settings_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (box), self->priv->output_settings_box);
/* Input page */
self->priv->input_box = gtk_vbox_new (FALSE, 12);
self->priv->input_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (self->priv->input_box), 12);
label = gtk_label_new (_("Input"));
gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook),
@ -1826,12 +1826,12 @@ gvc_mixer_dialog_constructor (GType type,
alignment,
FALSE, FALSE, 0);
box = gtk_hbox_new (FALSE, 6);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (self->priv->input_box),
box,
FALSE, FALSE, 6);
sbox = gtk_hbox_new (FALSE, 6);
sbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box),
sbox,
FALSE, FALSE, 0);
@ -1852,14 +1852,14 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->input_level_bar,
TRUE, TRUE, 6);
ebox = gtk_hbox_new (FALSE, 6);
ebox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box),
ebox,
FALSE, FALSE, 0);
if (self->priv->size_group != NULL)
gtk_size_group_add_widget (self->priv->size_group, ebox);
self->priv->input_settings_box = gtk_hbox_new (FALSE, 6);
self->priv->input_settings_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (self->priv->input_box),
self->priv->input_settings_box,
FALSE, FALSE, 0);
@ -1889,7 +1889,7 @@ gvc_mixer_dialog_constructor (GType type,
gtk_container_add (GTK_CONTAINER (alignment), box);
/* Hardware page */
self->priv->hw_box = gtk_vbox_new (FALSE, 12);
self->priv->hw_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (self->priv->hw_box), 12);
label = gtk_label_new (_("Hardware"));
gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook),
@ -1929,11 +1929,11 @@ gvc_mixer_dialog_constructor (GType type,
_gtk_label_make_bold (GTK_LABEL (label));
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
gtk_box_pack_start (GTK_BOX (self->priv->hw_box), box, FALSE, TRUE, 12);
self->priv->hw_settings_box = gtk_vbox_new (FALSE, 12);
self->priv->hw_settings_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_add (GTK_CONTAINER (box), self->priv->hw_settings_box);
/* Effects page */
self->priv->sound_effects_box = gtk_vbox_new (FALSE, 6);
self->priv->sound_effects_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (self->priv->sound_effects_box), 12);
label = gtk_label_new (_("Sound Effects"));
gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook),
@ -1953,7 +1953,7 @@ gvc_mixer_dialog_constructor (GType type,
TRUE, TRUE, 6);
/* Applications */
self->priv->applications_box = gtk_vbox_new (FALSE, 12);
self->priv->applications_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (self->priv->applications_box), 12);
label = gtk_label_new (_("Applications"));
gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook),

4
panels/sound/gvc-speaker-test.c
View file

@ -315,7 +315,7 @@ channel_control_new (ca_context *canberra, pa_channel_position_t position)
GtkWidget *test_button;
const char *name;
control = gtk_vbox_new (FALSE, 6);
control = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
g_object_set_data (G_OBJECT (control), "playing", GINT_TO_POINTER(FALSE));
g_object_set_data (G_OBJECT (control), "position", GINT_TO_POINTER(position));
g_object_set_data (G_OBJECT (control), "canberra", canberra);
@ -340,7 +340,7 @@ channel_control_new (ca_context *canberra, pa_channel_position_t position)
ATK_RELATION_LABELLED_BY,
gtk_widget_get_accessible (label));
box = gtk_hbox_new (FALSE, 0);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (box), test_button, TRUE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (control), box, FALSE, FALSE, 0);

2
panels/sound/gvc-stream-status-icon.c
View file

@ -636,7 +636,7 @@ gvc_stream_status_icon_constructor (GType type,
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
gtk_container_add (GTK_CONTAINER (icon->priv->dock), frame);
box = gtk_vbox_new (FALSE, 6);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (box), 2);
gtk_container_add (GTK_CONTAINER (frame), box);