From: Guillaume Desmottes Date: Wed, 16 Nov 2011 16:07:51 +0000 (+0100) Subject: use gtk_box_new() instead of gtk_[h,v]box_new() X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=76d770933b31a9a928942dc0782b0cdb23ea7223 use gtk_box_new() instead of gtk_[h,v]box_new() https://bugzilla.gnome.org/show_bug.cgi?id=662903 --- diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 33082ba6..f1b463c0 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -1172,7 +1172,7 @@ account_widget_build_external (EmpathyAccountWidget *self, const gchar *provider, *name = NULL; GDesktopAppInfo *desktop_info = NULL; - self->ui_details->widget = gtk_vbox_new (FALSE, 6); + self->ui_details->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); priv->grid_common_settings = gtk_grid_new (); provider = tp_account_get_storage_provider (account); @@ -2190,9 +2190,11 @@ do_constructed (GObject *obj) !(storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS)) { - GtkWidget *hbox = gtk_hbox_new (TRUE, 3); + GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); GtkWidget *image; + gtk_box_set_homogeneous (hbox, TRUE); + /* We can't use the stock button as its accelerator ('C') clashes with * the Close button. */ priv->cancel_button = gtk_button_new (); diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 307ecf3e..f2afc4d4 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -3473,7 +3473,7 @@ chat_prompt_to_save_password (EmpathyChat *self, gtk_info_bar_set_message_type (GTK_INFO_BAR (data->info_bar), GTK_MESSAGE_QUESTION); - hbox = gtk_hbox_new (FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0); /* Add image */ @@ -3667,7 +3667,7 @@ display_password_info_bar (EmpathyChat *self) content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); - hbox = gtk_hbox_new (FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0); /* Add image */ diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 0df8df7e..1c56a868 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -137,7 +137,7 @@ empathy_subscription_dialog_show (EmpathyContact *contact, g_free (filename); g_object_unref (gui); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_end (GTK_BOX (hbox_subscription), vbox, TRUE, TRUE, 0); diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c index 174f0441..89a7918a 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -498,11 +498,11 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self) /* Title */ gtk_window_set_title (GTK_WINDOW (self), _("Search contacts")); - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); /* Account chooser */ - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); label = gtk_label_new (_("Account:")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); gtk_size_group_add_widget (size_group, label); @@ -525,7 +525,7 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self) #endif /* Search input */ - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); label = gtk_label_new (_("Search: ")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); gtk_size_group_add_widget (size_group, label); diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 4a6640ed..476fb621 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -1625,7 +1625,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information) else { /* Pack the protocol icon with the account name in an hbox */ - information->widget_account = gtk_hbox_new (FALSE, 6); + information->widget_account = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); information->label_account = gtk_label_new (NULL); if (!(information->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP)) { diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c index 529aff26..1782dc80 100644 --- a/libempathy-gtk/empathy-dialpad-widget.c +++ b/libempathy-gtk/empathy-dialpad-widget.c @@ -140,7 +140,7 @@ empathy_dialpad_widget_init (EmpathyDialpadWidget *self) for (i = 0; dtmfbuttons[i].label != NULL; i++) { - GtkWidget *vbox = gtk_vbox_new (FALSE, 0); + GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); GtkWidget *button = gtk_button_new (); GtkWidget *label; gchar *str; diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index 33e4d8d5..fa092b6d 100644 --- a/libempathy-gtk/empathy-groups-widget.c +++ b/libempathy-gtk/empathy-groups-widget.c @@ -340,7 +340,7 @@ set_up (EmpathyGroupsWidget *self) alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); - vbox = GTK_BOX (gtk_vbox_new (FALSE, 6)); + vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6)); label = gtk_label_new (_("Select the groups you want this contact to appear " "in. Note that you can select more than one group or no groups.")); @@ -350,7 +350,7 @@ set_up (EmpathyGroupsWidget *self) gtk_box_pack_start (vbox, label, FALSE, FALSE, 0); gtk_widget_show (label); - hbox = GTK_BOX (gtk_hbox_new (FALSE, 12)); + hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12)); priv->add_group_entry = gtk_entry_new (); g_signal_connect (priv->add_group_entry, "changed", diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c index 957a4e33..d53633f7 100644 --- a/libempathy-gtk/empathy-individual-linker.c +++ b/libempathy-gtk/empathy-individual-linker.c @@ -355,7 +355,7 @@ set_up (EmpathyIndividualLinker *self) priv = GET_PRIV (self); - top_vbox = gtk_vbox_new (FALSE, 6); + top_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); /* Layout panes */ @@ -366,7 +366,7 @@ set_up (EmpathyIndividualLinker *self) gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 6); gtk_widget_show (alignment); - vbox = GTK_BOX (gtk_vbox_new (FALSE, 6)); + vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6)); label = gtk_label_new (NULL); tmp = g_strdup_printf ("%s", _("Select contacts to link")); gtk_label_set_markup (GTK_LABEL (label), tmp); @@ -440,7 +440,7 @@ set_up (EmpathyIndividualLinker *self) gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 0); gtk_widget_show (alignment); - vbox = GTK_BOX (gtk_vbox_new (FALSE, 6)); + vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6)); label = gtk_label_new (NULL); tmp = g_strdup_printf ("%s", _("New contact preview")); gtk_label_set_markup (GTK_LABEL (label), tmp); diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index aa7a7f05..5a1c559d 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -1323,7 +1323,7 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self, current_row++; /* Presence */ - priv->hbox_presence = gtk_hbox_new (FALSE, 6); + priv->hbox_presence = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); /* Presence image */ image = gtk_image_new_from_stock (GTK_STOCK_MISSING_IMAGE, @@ -1478,7 +1478,7 @@ add_persona (EmpathyIndividualWidget *self, gtk_widget_show (label); /* Pack the protocol icon with the account name in an hbox */ - hbox = GTK_BOX (gtk_hbox_new (FALSE, 6)); + hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6)); account_label = gtk_label_new (NULL); gtk_label_set_selectable (GTK_LABEL (account_label), diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index e196537f..af375f1b 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -657,7 +657,7 @@ empathy_log_window_init (EmpathyLogWindow *self) G_CALLBACK (gtk_widget_destroy), self); /* Account chooser for chats */ - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); self->priv->account_chooser = empathy_account_chooser_new (); account_chooser = EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser); @@ -687,7 +687,7 @@ empathy_log_window_init (EmpathyLogWindow *self) gtk_container_add (GTK_CONTAINER (accounts), vbox); /* Search entry */ - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); self->priv->search_entry = gtk_entry_new (); gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry), @@ -3758,7 +3758,7 @@ log_window_delete_menu_clicked_cb (GtkMenuItem *menuitem, content_area = gtk_message_dialog_get_message_area ( GTK_MESSAGE_DIALOG (dialog)); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); label = gtk_label_new (_("Delete from:")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c index 7bfc313e..b9fd08d8 100644 --- a/libempathy-gtk/empathy-theme-boxes.c +++ b/libempathy-gtk/empathy-theme-boxes.c @@ -239,7 +239,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme, /* Create a hbox for the header and resize it when the view allocation * changes */ - box = gtk_hbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); g_signal_connect_object (view, "size-allocate", G_CALLBACK (table_size_allocate_cb), box, 0); diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c index efd6dc18..d6fc8a27 100644 --- a/src/empathy-account-assistant.c +++ b/src/empathy-account-assistant.c @@ -119,11 +119,11 @@ build_error_vbox (const gchar *primary_message, GtkWidget *main_vbox, *w, *hbox; PangoAttrList *list; - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -600,11 +600,11 @@ account_assistant_build_introduction_page (EmpathyAccountAssistant *self) GdkPixbuf *pix; const gchar *str; - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_widget_show (main_vbox); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - hbox_1 = gtk_hbox_new (FALSE, 12); + hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (main_vbox), hbox_1, TRUE, TRUE, 0); gtk_widget_show (hbox_1); @@ -638,13 +638,14 @@ account_assistant_build_introduction_page (EmpathyAccountAssistant *self) gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0); gtk_widget_show (w); - vbox_1 = gtk_vbox_new (TRUE, 0); + vbox_1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (vbox_1, TRUE); gtk_container_add (GTK_CONTAINER (w), vbox_1); gtk_widget_show (vbox_1); if (empathy_import_accounts_to_import ()) { - hbox_1 = gtk_hbox_new (FALSE, 0); + hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (vbox_1), hbox_1, TRUE, TRUE, 0); gtk_widget_show (hbox_1); @@ -721,7 +722,7 @@ account_assistant_build_import_page (EmpathyAccountAssistant *self) EmpathyImportWidget *iw; EmpathyAccountAssistantPriv *priv = GET_PRIV (self); - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); w = gtk_label_new (_("Select the accounts you want to import:")); gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); @@ -767,11 +768,11 @@ account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self) EmpathyAccountAssistantPriv *priv = GET_PRIV (self); GtkWidget *main_vbox, *w, *chooser, *vbox, *hbox, *radio; - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -790,7 +791,7 @@ account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self) gtk_widget_show (chooser); priv->chooser = chooser; - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_end (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); @@ -806,7 +807,7 @@ account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self) gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); gtk_widget_show (w); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (w), hbox); gtk_widget_show (hbox); @@ -1072,11 +1073,11 @@ account_assistant_build_salut_page (EmpathyAccountAssistant *self) EmpathyAccountWidget *widget_object; gchar *markup; - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_widget_show (main_vbox); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - hbox_1 = gtk_hbox_new (FALSE, 12); + hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (main_vbox), hbox_1, TRUE, TRUE, 0); gtk_widget_show (hbox_1); diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index b900504c..b5795233 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1702,7 +1702,8 @@ empathy_call_window_init (EmpathyCallWindow *self) gtk_container_add (GTK_CONTAINER (self), top_vbox); - priv->content_hbox = gtk_hbox_new (FALSE, CONTENT_HBOX_SPACING); + priv->content_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, + CONTENT_HBOX_SPACING); gtk_container_set_border_width (GTK_CONTAINER (priv->content_hbox), CONTENT_HBOX_BORDER_WIDTH); gtk_box_pack_start (GTK_BOX (priv->pane), priv->content_hbox, @@ -2999,7 +3000,7 @@ display_error (EmpathyCallWindow *self, content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); /* hbox containing the image and the messages vbox */ - hbox = gtk_hbox_new (FALSE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_container_add (GTK_CONTAINER (content_area), hbox); /* Add image */ @@ -3007,7 +3008,7 @@ display_error (EmpathyCallWindow *self, gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); /* vbox containing the main message and the details expander */ - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); /* Add text */ diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 46f76466..9ad6b297 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -269,7 +269,7 @@ chat_window_create_label (EmpathyChatWindow *window, PangoAttribute *attr; /* The spacing between the button and the label. */ - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); event_box = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); @@ -295,7 +295,7 @@ chat_window_create_label (EmpathyChatWindow *window, status_image = gtk_image_new (); /* Spacing between the icon and label. */ - event_box_hbox = gtk_hbox_new (FALSE, 0); + event_box_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (event_box_hbox), status_image, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (event_box_hbox), name_label, TRUE, TRUE, 0); diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 80dad106..b298600a 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -1439,7 +1439,7 @@ am_prepared_cb (GObject *am, g_signal_connect (object, "key-press-event", G_CALLBACK (debug_window_key_press_event_cb), NULL); - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (object), vbox); gtk_widget_show (vbox); diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index da0c9d3e..77d11298 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -78,8 +78,8 @@ import_dialog_show_warning_message (EmpathyImportDialog *self) { GtkWidget *hbox, *vbox, *w; - vbox = gtk_vbox_new (FALSE, 12); - hbox = gtk_hbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); w = gtk_label_new (_("No accounts to import could be found. Empathy " "currently only supports importing accounts from Pidgin.")); diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 0e4b8bae..e4b2ccbf 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -1165,7 +1165,7 @@ main_window_setup_balance_create_widget (EmpathyMainWindow *window, EmpathyMainWindowPriv *priv = GET_PRIV (window); GtkWidget *hbox, *image, *label, *button; - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); /* protocol icon */ image = gtk_image_new (); diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index 22ecbd28..9bad57ab 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -371,7 +371,7 @@ static GtkWidget * empathy_streamed_media_window_create_video_input_add_slider (EmpathyStreamedMediaWindow *self, gchar *label_text, GtkWidget *bin) { - GtkWidget *vbox = gtk_vbox_new (FALSE, 2); + GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); GtkWidget *scale = gtk_vscale_new_with_range (0, 100, 10); GtkWidget *label = gtk_label_new (label_text); @@ -426,7 +426,8 @@ empathy_streamed_media_window_create_video_input (EmpathyStreamedMediaWindow *se EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self); GtkWidget *hbox; - hbox = gtk_hbox_new (TRUE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (hbox, TRUE); priv->video_contrast = empathy_streamed_media_window_create_video_input_add_slider ( self, _("Contrast"), hbox); @@ -533,9 +534,10 @@ empathy_streamed_media_window_create_audio_input (EmpathyStreamedMediaWindow *se EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self); GtkWidget *hbox, *vbox, *label; - hbox = gtk_hbox_new (TRUE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (hbox, TRUE); - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 3); priv->volume_scale = gtk_vscale_new_with_range (0, 150, 100); @@ -1035,7 +1037,8 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) gtk_container_add (GTK_CONTAINER (self), top_vbox); - priv->content_hbox = gtk_hbox_new (FALSE, CONTENT_HBOX_SPACING); + priv->content_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, + CONTENT_HBOX_SPACING); gtk_container_set_border_width (GTK_CONTAINER (priv->content_hbox), CONTENT_HBOX_BORDER_WIDTH); gtk_paned_pack1 (GTK_PANED (priv->pane), priv->content_hbox, TRUE, FALSE); @@ -1048,7 +1051,7 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) priv->remote_user_output_frame, TRUE, TRUE, CONTENT_HBOX_CHILDREN_PACKING_PADDING); - priv->remote_user_output_hbox = gtk_hbox_new (FALSE, 0); + priv->remote_user_output_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); priv->remote_user_avatar_widget = gtk_image_new (); @@ -1063,7 +1066,7 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) gtk_widget_set_size_request (priv->self_user_output_frame, SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGTH); - priv->self_user_output_hbox = gtk_hbox_new (FALSE, 0); + priv->self_user_output_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); priv->self_user_avatar_widget = gtk_image_new (); gtk_box_pack_start (GTK_BOX (priv->self_user_output_hbox), @@ -1083,7 +1086,7 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) /* The call will be started as soon the pipeline is playing */ priv->start_call_when_playing = TRUE; - priv->vbox = gtk_vbox_new (FALSE, 3); + priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_box_pack_start (GTK_BOX (priv->content_hbox), priv->vbox, FALSE, FALSE, CONTENT_HBOX_CHILDREN_PACKING_PADDING); gtk_box_pack_start (GTK_BOX (priv->vbox), priv->self_user_output_frame, @@ -1098,7 +1101,7 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) gtk_button_set_image (GTK_BUTTON (priv->sidebar_button), arrow); - h = gtk_hbox_new (FALSE, 3); + h = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_box_pack_end (GTK_BOX (priv->vbox), h, FALSE, FALSE, 3); gtk_box_pack_end (GTK_BOX (h), priv->sidebar_button, FALSE, FALSE, 3); @@ -2167,7 +2170,7 @@ display_error (EmpathyStreamedMediaWindow *self, content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); /* hbox containing the image and the messages vbox */ - hbox = gtk_hbox_new (FALSE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_container_add (GTK_CONTAINER (content_area), hbox); /* Add image */ @@ -2175,7 +2178,7 @@ display_error (EmpathyStreamedMediaWindow *self, gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); /* vbox containing the main message and the details expander */ - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); /* Add text */ diff --git a/src/ev-sidebar.c b/src/ev-sidebar.c index 1d0b2df2..a5073698 100644 --- a/src/ev-sidebar.c +++ b/src/ev-sidebar.c @@ -152,15 +152,15 @@ ev_sidebar_init (EvSidebar *ev_sidebar) G_TYPE_INT); /* create a 6 6 6 0 border with GtkBoxes */ - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (ev_sidebar), hbox, TRUE, TRUE, 6); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), gtk_vbox_new (FALSE, 0), FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), gtk_box_new (GTK_ORIENTATION_VERTICAL, 0), FALSE, FALSE, 0); /* top option menu */ - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox);