1
From 3ae795ea6ec09c8a1d49533510904dec9425f617 Mon Sep 17 00:00:00 2001
2
From: Debarshi Ray <debarshir@gnome.org>
3
Date: Sat, 14 Apr 2012 21:10:37 +0000
4
Subject: online-accounts: goa_provider_show_account now expects GtkGrids, not GtkTable
6
Fixes: https://bugzilla.gnome.org/669625
8
diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
9
index 7891203..94d1bea 100644
10
--- a/panels/online-accounts/cc-online-accounts-panel.c
11
+++ b/panels/online-accounts/cc-online-accounts-panel.c
12
@@ -323,8 +323,9 @@ show_page_account (GoaPanel *panel,
16
- GtkWidget *alignment;
19
+ GtkWidget *left_grid;
20
+ GtkWidget *right_grid;
23
GoaProvider *provider;
24
@@ -357,9 +358,16 @@ show_page_account (GoaPanel *panel,
25
g_signal_connect (bar, "response", G_CALLBACK (on_info_bar_response), panel);
28
- table = gtk_table_new (3, 2, FALSE);
29
- gtk_table_set_row_spacings (GTK_TABLE (table), 0);
30
- gtk_table_set_col_spacings (GTK_TABLE (table), 12);
31
+ left_grid = gtk_grid_new ();
32
+ gtk_widget_set_halign (left_grid, GTK_ALIGN_END);
33
+ gtk_widget_set_hexpand (left_grid, TRUE);
34
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (left_grid), GTK_ORIENTATION_VERTICAL);
35
+ gtk_grid_set_row_spacing (GTK_GRID (left_grid), 0);
37
+ right_grid = gtk_grid_new ();
38
+ gtk_widget_set_hexpand (right_grid, TRUE);
39
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (right_grid), GTK_ORIENTATION_VERTICAL);
40
+ gtk_grid_set_row_spacing (GTK_GRID (right_grid), 0);
44
@@ -367,12 +375,16 @@ show_page_account (GoaPanel *panel,
47
GTK_BOX (panel->accounts_vbox),
49
+ GTK_GRID (left_grid),
50
+ GTK_GRID (right_grid));
53
- alignment = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
54
- gtk_container_add (GTK_CONTAINER (alignment), table);
55
- gtk_box_pack_start (GTK_BOX (panel->accounts_vbox), alignment, FALSE, TRUE, 0);
56
+ grid = gtk_grid_new ();
57
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_HORIZONTAL);
58
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
59
+ gtk_container_add (GTK_CONTAINER (grid), left_grid);
60
+ gtk_container_add (GTK_CONTAINER (grid), right_grid);
61
+ gtk_box_pack_start (GTK_BOX (panel->accounts_vbox), grid, FALSE, TRUE, 0);
63
gtk_widget_show_all (panel->accounts_vbox);