aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-accounts-dialog.c
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-11-08 06:49:41 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-11-08 06:51:35 +0800
commit44b063e9cd039d7682da55b214ae8f84ace0ca5d (patch)
treecaea2dc38b5b66fb99e575df99f1e43d8b8559b0 /src/empathy-accounts-dialog.c
parent945df143a94c9c64c925591e09e6dd28c43408ff (diff)
downloadgsoc2013-empathy-44b063e9cd039d7682da55b214ae8f84ace0ca5d.tar
gsoc2013-empathy-44b063e9cd039d7682da55b214ae8f84ace0ca5d.tar.gz
gsoc2013-empathy-44b063e9cd039d7682da55b214ae8f84ace0ca5d.tar.bz2
gsoc2013-empathy-44b063e9cd039d7682da55b214ae8f84ace0ca5d.tar.lz
gsoc2013-empathy-44b063e9cd039d7682da55b214ae8f84ace0ca5d.tar.xz
gsoc2013-empathy-44b063e9cd039d7682da55b214ae8f84ace0ca5d.tar.zst
gsoc2013-empathy-44b063e9cd039d7682da55b214ae8f84ace0ca5d.zip
accounts-dialog: fix box packing issue in infobar
Expanding the status causes the icon to be placed on the far left of the box. This regression caused by my work in 1cd6e8253a3be284b8578fd9ea37016d0197d61b. Need an additional hbox and to expand that. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=663567
Diffstat (limited to 'src/empathy-accounts-dialog.c')
-rw-r--r--src/empathy-accounts-dialog.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index d1c7e1204..9e2fea781 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2178,7 +2178,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
gchar *filename;
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
GtkWidget *content_area, *action_area;
- GtkWidget *grid;
+ GtkWidget *grid, *hbox;
GtkWidget *alig;
GtkWidget *sw, *toolbar;
GtkStyleContext *context;
@@ -2277,7 +2277,13 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
/* first row */
priv->label_name = gtk_label_new (NULL);
- gtk_grid_attach (GTK_GRID (grid), priv->label_name, 1, 0, 3, 1);
+ gtk_grid_attach (GTK_GRID (grid), priv->label_name, 1, 0, 1, 1);
+
+ /* second row */
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_widget_set_hexpand (hbox, TRUE);
+ gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
+ gtk_grid_attach (GTK_GRID (grid), hbox, 1, 1, 1, 1);
/* set up spinner */
priv->throbber = gtk_spinner_new ();
@@ -2288,18 +2294,17 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
priv->label_status = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (priv->label_status), TRUE);
- gtk_widget_set_hexpand (priv->label_status, TRUE);
- gtk_grid_attach (GTK_GRID (grid), priv->throbber, 1, 1, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), priv->image_status, 2, 1, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), priv->label_status, 3, 1, 1, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->throbber, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->image_status, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->label_status, FALSE, FALSE, 0);
/* enabled switch */
priv->enabled_switch = gtk_switch_new ();
gtk_widget_set_valign (priv->enabled_switch, GTK_ALIGN_CENTER);
g_signal_connect (priv->enabled_switch, "notify::active",
G_CALLBACK (accounts_dialog_enable_switch_active_cb), dialog);
- gtk_grid_attach (GTK_GRID (grid), priv->enabled_switch, 4, 0, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), priv->enabled_switch, 2, 0, 1, 2);
gtk_widget_show_all (grid);