aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
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 /libempathy-gtk
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 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-account-widget.c6
-rw-r--r--libempathy-gtk/empathy-chat.c4
-rw-r--r--libempathy-gtk/empathy-contact-dialogs.c2
-rw-r--r--libempathy-gtk/empathy-contact-search-dialog.c6
-rw-r--r--libempathy-gtk/empathy-contact-widget.c2
-rw-r--r--libempathy-gtk/empathy-dialpad-widget.c2
-rw-r--r--libempathy-gtk/empathy-groups-widget.c4
-rw-r--r--libempathy-gtk/empathy-individual-linker.c6
-rw-r--r--libempathy-gtk/empathy-individual-widget.c4
-rw-r--r--libempathy-gtk/empathy-log-window.c6
-rw-r--r--libempathy-gtk/empathy-theme-boxes.c2
11 files changed, 23 insertions, 21 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 33082ba63..f1b463c03 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 307ecf3e1..f2afc4d4e 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 0df8df7eb..1c56a868e 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 174f0441d..89a7918aa 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 4a6640edb..476fb6217 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 529aff26f..1782dc807 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 33e4d8d5a..fa092b6d6 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 957a4e334..d53633f7a 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 ("<b>%s</b>", _("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 ("<b>%s</b>", _("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 aa7a7f053..5a1c559d1 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 e196537fe..af375f1b5 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 7bfc313e1..b9fd08d84 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);