aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-17 00:07:51 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-21 18:00:35 +0800
commit76d770933b31a9a928942dc0782b0cdb23ea7223 (patch)
tree457e48adb427f1c264b1bab8cdf1ebd060a74d3d /src
parentbd43c34901fbcc8202c3e96246fe77a31a4154db (diff)
downloadgsoc2013-empathy-76d770933b31a9a928942dc0782b0cdb23ea7223.tar
gsoc2013-empathy-76d770933b31a9a928942dc0782b0cdb23ea7223.tar.gz
gsoc2013-empathy-76d770933b31a9a928942dc0782b0cdb23ea7223.tar.bz2
gsoc2013-empathy-76d770933b31a9a928942dc0782b0cdb23ea7223.tar.lz
gsoc2013-empathy-76d770933b31a9a928942dc0782b0cdb23ea7223.tar.xz
gsoc2013-empathy-76d770933b31a9a928942dc0782b0cdb23ea7223.tar.zst
gsoc2013-empathy-76d770933b31a9a928942dc0782b0cdb23ea7223.zip
use gtk_box_new() instead of gtk_[h,v]box_new()
https://bugzilla.gnome.org/show_bug.cgi?id=662903
Diffstat (limited to 'src')
-rw-r--r--src/empathy-account-assistant.c27
-rw-r--r--src/empathy-call-window.c7
-rw-r--r--src/empathy-chat-window.c4
-rw-r--r--src/empathy-debug-window.c2
-rw-r--r--src/empathy-import-dialog.c4
-rw-r--r--src/empathy-main-window.c2
-rw-r--r--src/empathy-streamed-media-window.c25
-rw-r--r--src/ev-sidebar.c8
8 files changed, 42 insertions, 37 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index efd6dc184..d6fc8a278 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 b900504cf..b57952337 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 46f76466b..9ad6b2975 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 80dad106a..b298600a9 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 da0c9d3ea..77d11298f 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 0e4b8bae5..e4b2ccbfb 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 22ecbd282..9bad57ab0 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 1d0b2df2f..a50736982 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);