aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-01 20:39:49 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-01 23:02:46 +0800
commitb26b85d3bddf2afd23b621a817cd5041c5e2ef17 (patch)
tree5aaf046d90d48a148a0c585a9914ee99960f44b5
parent4131d7e70306766e91cefffb02524f2b667d86af (diff)
downloadgsoc2013-empathy-b26b85d3bddf2afd23b621a817cd5041c5e2ef17.tar
gsoc2013-empathy-b26b85d3bddf2afd23b621a817cd5041c5e2ef17.tar.gz
gsoc2013-empathy-b26b85d3bddf2afd23b621a817cd5041c5e2ef17.tar.bz2
gsoc2013-empathy-b26b85d3bddf2afd23b621a817cd5041c5e2ef17.tar.lz
gsoc2013-empathy-b26b85d3bddf2afd23b621a817cd5041c5e2ef17.tar.xz
gsoc2013-empathy-b26b85d3bddf2afd23b621a817cd5041c5e2ef17.tar.zst
gsoc2013-empathy-b26b85d3bddf2afd23b621a817cd5041c5e2ef17.zip
account-widget-*: port to GtkGrid
https://bugzilla.gnome.org/show_bug.cgi?id=662903
Diffstat
-rw-r--r--libempathy-gtk/empathy-account-widget-aim.ui36
-rw-r--r--libempathy-gtk/empathy-account-widget-generic.ui24
-rw-r--r--libempathy-gtk/empathy-account-widget-groupwise.ui38
-rw-r--r--libempathy-gtk/empathy-account-widget-icq.ui44
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.ui43
-rw-r--r--libempathy-gtk/empathy-account-widget-jabber.ui49
-rw-r--r--libempathy-gtk/empathy-account-widget-local-xmpp.ui46
-rw-r--r--libempathy-gtk/empathy-account-widget-msn.ui38
-rw-r--r--libempathy-gtk/empathy-account-widget-sip.c17
-rw-r--r--libempathy-gtk/empathy-account-widget-sip.h2
-rw-r--r--libempathy-gtk/empathy-account-widget-sip.ui111
-rw-r--r--libempathy-gtk/empathy-account-widget-yahoo.ui51
-rw-r--r--libempathy-gtk/empathy-account-widget.c110
13 files changed, 126 insertions, 483 deletions
diff --git a/libempathy-gtk/empathy-account-widget-aim.ui b/libempathy-gtk/empathy-account-widget-aim.ui
index bbc358b4b..cbabbf5ba 100644
--- a/libempathy-gtk/empathy-account-widget-aim.ui
+++ b/libempathy-gtk/empathy-account-widget-aim.ui
@@ -13,10 +13,8 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_common_settings">
+ <object class="GtkGrid" id="grid_common_settings">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -29,9 +27,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -43,8 +38,6 @@
<property name="mnemonic_widget">entry_screenname</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -54,8 +47,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -66,10 +57,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -85,11 +73,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -103,11 +87,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -128,10 +108,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table_advanced_settings">
+ <object class="GtkGrid" id="grid_advanced_settings">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -144,10 +122,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -160,9 +135,6 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -172,8 +144,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -185,8 +155,6 @@
<property name="mnemonic_widget">entry_server</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-generic.ui b/libempathy-gtk/empathy-account-widget-generic.ui
index c22fda317..2b65f002b 100644
--- a/libempathy-gtk/empathy-account-widget-generic.ui
+++ b/libempathy-gtk/empathy-account-widget-generic.ui
@@ -7,20 +7,10 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_common_settings">
+ <object class="GtkGrid" id="grid_common_settings">
<property name="visible">True</property>
- <property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -43,20 +33,10 @@
<property name="visible">True</property>
<property name="resize_mode">queue</property>
<child>
- <object class="GtkTable" id="table_advanced_settings">
+ <object class="GtkGrid" id="grid_advanced_settings">
<property name="visible">True</property>
- <property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-groupwise.ui b/libempathy-gtk/empathy-account-widget-groupwise.ui
index e5c89ec52..9be839bf4 100644
--- a/libempathy-gtk/empathy-account-widget-groupwise.ui
+++ b/libempathy-gtk/empathy-account-widget-groupwise.ui
@@ -12,10 +12,8 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_common_groupwise_settings">
+ <object class="GtkGrid" id="grid_common_groupwise_settings">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -27,9 +25,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -41,8 +36,6 @@
<property name="mnemonic_widget">entry_id</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -52,8 +45,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -69,11 +60,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -84,11 +71,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -102,11 +85,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -126,10 +105,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table_advanced_groupwise_settings">
+ <object class="GtkGrid" id="grid_advanced_groupwise_settings">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
@@ -142,9 +119,6 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -156,8 +130,7 @@
<property name="mnemonic_widget">entry_server</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -167,8 +140,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -182,10 +153,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui
index df2ddce17..d95027f3e 100644
--- a/libempathy-gtk/empathy-account-widget-icq.ui
+++ b/libempathy-gtk/empathy-account-widget-icq.ui
@@ -13,10 +13,8 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_common_settings">
+ <object class="GtkGrid" id="grid_common_settings">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -29,9 +27,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -43,8 +38,6 @@
<property name="mnemonic_widget">entry_uin</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -54,8 +47,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -66,10 +57,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -85,11 +73,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -103,11 +87,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -128,10 +108,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table_advanced_settings">
+ <object class="GtkGrid" id="grid_advanced_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -143,8 +121,6 @@
<property name="mnemonic_widget">entry_charset</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -157,10 +133,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -170,10 +143,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -186,9 +156,7 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -201,9 +169,7 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -213,8 +179,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index 3e12c90d9..aa6e643ec 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -57,11 +57,9 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table14">
+ <object class="GtkGrid" id="greid14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -72,8 +70,6 @@
<property name="label" translatable="yes">Network:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -85,9 +81,6 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -97,8 +90,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -108,11 +99,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -149,10 +136,9 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table15">
+ <object class="GtkGrid" id="grid15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
@@ -173,7 +159,6 @@
</child>
</object>
<packing>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -249,8 +234,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -398,11 +381,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table_irc_settings1">
+ <object class="GtkGrid" id="grid_irc_settings1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -413,10 +394,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -428,9 +406,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -442,10 +417,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -459,9 +431,7 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -473,8 +443,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -486,8 +455,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui
index c8aa1d494..f4ee3b559 100644
--- a/libempathy-gtk/empathy-account-widget-jabber.ui
+++ b/libempathy-gtk/empathy-account-widget-jabber.ui
@@ -223,7 +223,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkGrid" id="table_common_settings">
+ <object class="GtkGrid" id="grid_common_settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -411,11 +411,9 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_advanced_settings">
+ <object class="GtkGrid" id="grid_advanced_settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -425,10 +423,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -440,10 +435,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -458,11 +450,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -476,9 +464,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</object>
<packing>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -492,9 +478,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -509,9 +493,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
</object>
@@ -528,12 +510,10 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
@@ -546,10 +526,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -559,8 +536,6 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -575,11 +550,8 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -593,9 +565,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -608,8 +578,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
<property name="mnemonic_widget">entry_server</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
index f7f0784ba..e5fc09670 100644
--- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui
+++ b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
@@ -7,10 +7,8 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_common_settings">
+ <object class="GtkGrid" id="grid_common_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -20,10 +18,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -33,10 +28,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -46,8 +38,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -60,9 +50,7 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -75,9 +63,7 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -89,8 +75,7 @@
<property name="mnemonic_widget">entry_first_name</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
</object>
@@ -105,10 +90,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table_advanced_settings">
+ <object class="GtkGrid" id="grid_advanced_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -118,8 +101,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -131,8 +112,7 @@
<property name="mnemonic_widget">entry_published</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -142,10 +122,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -155,10 +132,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -171,9 +145,7 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -186,9 +158,7 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/libempathy-gtk/empathy-account-widget-msn.ui
index 3275a0165..6561e5cb0 100644
--- a/libempathy-gtk/empathy-account-widget-msn.ui
+++ b/libempathy-gtk/empathy-account-widget-msn.ui
@@ -12,10 +12,8 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_common_msn_settings">
+ <object class="GtkGrid" id="grid_common_msn_settings">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -27,9 +25,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -41,8 +36,6 @@
<property name="mnemonic_widget">entry_id</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -52,8 +45,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -69,11 +60,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -84,11 +71,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -102,11 +85,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -126,10 +105,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table_advanced_msn_settings">
+ <object class="GtkGrid" id="grid_advanced_msn_settings">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
@@ -142,9 +119,6 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -156,8 +130,7 @@
<property name="mnemonic_widget">entry_server</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -167,8 +140,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -182,10 +153,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 405981b9e..d11634e75 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -111,12 +111,12 @@ checkbutton_tel_toggled (
void
empathy_account_widget_sip_build (EmpathyAccountWidget *self,
const char *filename,
- GtkWidget **table_common_settings)
+ GtkWidget **grid_common_settings)
{
EmpathyAccountWidgetSip *settings;
GtkWidget *vbox_settings;
gboolean is_simple;
- GtkWidget *table_advanced;
+ GtkWidget *grid_advanced;
g_object_get (self, "simple", &is_simple, NULL);
@@ -144,8 +144,8 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
settings->self = self;
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_settings", table_common_settings,
- "table_advanced_sip_settings", &table_advanced,
+ "grid_common_settings", grid_common_settings,
+ "grid_advanced_sip_settings", &grid_advanced,
"vbox_sip_settings", &vbox_settings,
"label_stun-server", &settings->label_stun_server,
"entry_stun-server", &settings->entry_stun_server,
@@ -217,8 +217,8 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
empathy_account_widget_setup_widget (self, settings->combobox_transport,
"transport");
- gtk_table_attach_defaults (GTK_TABLE (table_advanced),
- settings->combobox_transport, 1, 4, 11, 12);
+ gtk_grid_attach (GTK_GRID (grid_advanced), settings->combobox_transport,
+ 1, 11, 3, 1);
gtk_widget_show (settings->combobox_transport);
@@ -257,8 +257,9 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
empathy_account_widget_setup_widget (self,
settings->combobox_keep_alive_mechanism, "keepalive-mechanism");
- gtk_table_attach_defaults (GTK_TABLE (table_advanced),
- settings->combobox_keep_alive_mechanism, 1, 4, 7, 8);
+ gtk_grid_attach (GTK_GRID (grid_advanced),
+ settings->combobox_keep_alive_mechanism,
+ 1, 7, 3, 1);
gtk_widget_show (settings->combobox_keep_alive_mechanism);
}
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 6334a745b..7673a5bfd 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
void empathy_account_widget_sip_build (EmpathyAccountWidget *self,
const char *filename,
- GtkWidget **table_common_settings);
+ GtkWidget **grid_common_settings);
G_END_DECLS
diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
index 5928d6077..171afd4c8 100644
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ b/libempathy-gtk/empathy-account-widget-sip.ui
@@ -20,11 +20,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table_common_settings">
+ <object class="GtkGrid" id="grid_common_settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -38,9 +36,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -50,8 +45,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -64,8 +57,7 @@
<property name="mnemonic_widget">entry_password</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -82,11 +74,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -96,11 +84,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -115,11 +99,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -134,10 +114,9 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">4</property>
</packing>
</child>
<child>
@@ -176,11 +155,9 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table_advanced_sip_settings">
+ <object class="GtkGrid" id="grid_advanced_sip_settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">13</property>
- <property name="n_columns">4</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
@@ -190,9 +167,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -202,9 +177,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">4</property>
<property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
@@ -214,9 +188,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -227,9 +199,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">4</property>
<property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
@@ -243,7 +214,6 @@
</attributes>
</object>
<packing>
- <property name="right_attach">4</property>
</packing>
</child>
<child>
@@ -257,9 +227,8 @@
</attributes>
</object>
<packing>
- <property name="right_attach">4</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -273,9 +242,8 @@
</attributes>
</object>
<packing>
- <property name="right_attach">4</property>
<property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -295,9 +263,7 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -318,11 +284,9 @@
</child>
</object>
<packing>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">4</property>
</packing>
</child>
<child>
@@ -342,9 +306,9 @@
</child>
</object>
<packing>
- <property name="right_attach">4</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">0</property>
+ <property name="width">4</property>
</packing>
</child>
<child>
@@ -363,7 +327,7 @@
</object>
<packing>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -377,9 +341,8 @@
</attributes>
</object>
<packing>
- <property name="right_attach">4</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -398,7 +361,7 @@
</object>
<packing>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -417,7 +380,7 @@
</object>
<packing>
<property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -436,7 +399,7 @@
</object>
<packing>
<property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -455,7 +418,7 @@
</object>
<packing>
<property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -475,9 +438,9 @@
</child>
</object>
<packing>
- <property name="right_attach">4</property>
<property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
+ <property name="left_attach">0</property>
+ <property name="width">4</property>
</packing>
</child>
<child>
@@ -497,9 +460,9 @@
</child>
</object>
<packing>
- <property name="right_attach">4</property>
<property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
+ <property name="left_attach">0</property>
+ <property name="width">4</property>
</packing>
</child>
<child>
@@ -512,9 +475,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -526,9 +487,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -540,9 +499,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -554,29 +511,9 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
index 90ad4ecf5..9d002538c 100644
--- a/libempathy-gtk/empathy-account-widget-yahoo.ui
+++ b/libempathy-gtk/empathy-account-widget-yahoo.ui
@@ -14,10 +14,8 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table_common_settings">
+ <object class="GtkGrid" id="grid_common_settings">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -30,9 +28,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -44,8 +39,6 @@
<property name="mnemonic_widget">entry_id</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -55,8 +48,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -67,10 +58,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -86,11 +74,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -104,11 +88,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -132,10 +112,8 @@
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
- <object class="GtkTable" id="table_advanced_settings">
+ <object class="GtkGrid" id="grid_advanced_settings">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
@@ -148,9 +126,7 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -163,9 +139,7 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -178,9 +152,7 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -190,10 +162,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -203,10 +172,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -219,9 +185,7 @@
</object>
<packing>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -234,10 +198,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index f3a2a66ad..8b693fa03 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -74,7 +74,7 @@ static ServiceInfo services_infos[N_SERVICES] = {
typedef struct {
EmpathyAccountSettings *settings;
- GtkWidget *table_common_settings;
+ GtkWidget *grid_common_settings;
GtkWidget *apply_button;
GtkWidget *cancel_button;
GtkWidget *entry_password;
@@ -735,32 +735,39 @@ account_widget_generic_format_param_name (const gchar *param_name)
static void
accounts_widget_generic_setup (EmpathyAccountWidget *self,
- GtkWidget *table_common_settings,
- GtkWidget *table_advanced_settings)
+ GtkWidget *grid_common_settings,
+ GtkWidget *grid_advanced_settings)
{
TpConnectionManagerParam *params, *param;
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ guint row_common = 0, row_advanced = 0;
params = empathy_account_settings_get_tp_params (priv->settings);
for (param = params; param != NULL && param->name != NULL; param++)
{
- GtkWidget *table_settings;
- guint n_rows = 0;
+ GtkWidget *grid_settings;
+ guint row;
GtkWidget *widget = NULL;
gchar *param_name_formatted;
if (param->flags & TP_CONN_MGR_PARAM_FLAG_REQUIRED)
- table_settings = table_common_settings;
+ {
+ grid_settings = grid_common_settings;
+ row = row_common++;
+ }
else if (priv->simple)
- return;
+ {
+ return;
+ }
else
- table_settings = table_advanced_settings;
+ {
+ grid_settings = grid_advanced_settings;
+ row = row_advanced++;
+ }
param_name_formatted = account_widget_generic_format_param_name
(param->name);
- g_object_get (table_settings, "n-rows", &n_rows, NULL);
- gtk_table_resize (GTK_TABLE (table_settings), ++n_rows, 2);
if (param->dbus_signature[0] == 's')
{
@@ -771,12 +778,9 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self,
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
g_free (str);
- gtk_table_attach (GTK_TABLE (table_settings),
- widget,
- 0, 1,
- n_rows - 1, n_rows,
- GTK_FILL, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid_settings),
+ widget, 0, row, 1, 1);
+
gtk_widget_show (widget);
widget = gtk_entry_new ();
@@ -786,12 +790,10 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self,
G_CALLBACK (gtk_widget_grab_focus),
NULL);
}
- gtk_table_attach (GTK_TABLE (table_settings),
- widget,
- 1, 2,
- n_rows - 1, n_rows,
- GTK_FILL | GTK_EXPAND, 0,
- 0, 0);
+
+ gtk_grid_attach (GTK_GRID (grid_settings),
+ widget, 1, row, 1, 1);
+
gtk_widget_show (widget);
}
/* int types: ynqiuxt. double type is 'd' */
@@ -828,32 +830,20 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self,
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
g_free (str);
- gtk_table_attach (GTK_TABLE (table_settings),
- widget,
- 0, 1,
- n_rows - 1, n_rows,
- GTK_FILL, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid_settings),
+ widget, 0, row, 1, 1);
gtk_widget_show (widget);
widget = gtk_spin_button_new_with_range (minint, maxint, step);
- gtk_table_attach (GTK_TABLE (table_settings),
- widget,
- 1, 2,
- n_rows - 1, n_rows,
- GTK_FILL | GTK_EXPAND, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid_settings),
+ widget, 1, row, 1, 1);
gtk_widget_show (widget);
}
else if (param->dbus_signature[0] == 'b')
{
widget = gtk_check_button_new_with_label (param_name_formatted);
- gtk_table_attach (GTK_TABLE (table_settings),
- widget,
- 0, 2,
- n_rows - 1, n_rows,
- GTK_FILL | GTK_EXPAND, 0,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (grid_settings),
+ widget, 0, row, 2, 1);
gtk_widget_show (widget);
}
else
@@ -1043,16 +1033,16 @@ account_widget_apply_clicked_cb (GtkWidget *button,
static void
account_widget_setup_generic (EmpathyAccountWidget *self)
{
- GtkWidget *table_common_settings;
- GtkWidget *table_advanced_settings;
+ GtkWidget *grid_common_settings;
+ GtkWidget *grid_advanced_settings;
- table_common_settings = GTK_WIDGET (gtk_builder_get_object
- (self->ui_details->gui, "table_common_settings"));
- table_advanced_settings = GTK_WIDGET (gtk_builder_get_object
- (self->ui_details->gui, "table_advanced_settings"));
+ grid_common_settings = GTK_WIDGET (gtk_builder_get_object
+ (self->ui_details->gui, "grid_common_settings"));
+ grid_advanced_settings = GTK_WIDGET (gtk_builder_get_object
+ (self->ui_details->gui, "grid_advanced_settings"));
- accounts_widget_generic_setup (self, table_common_settings,
- table_advanced_settings);
+ accounts_widget_generic_setup (self, grid_common_settings,
+ grid_advanced_settings);
g_object_unref (self->ui_details->gui);
}
@@ -1077,7 +1067,7 @@ account_widget_build_generic (EmpathyAccountWidget *self,
GtkWidget *expander_advanced;
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_settings", &priv->table_common_settings,
+ "grid_common_settings", &priv->grid_common_settings,
"vbox_generic_settings", &self->ui_details->widget,
"expander_advanced_settings", &expander_advanced,
NULL);
@@ -1183,7 +1173,7 @@ account_widget_build_external (EmpathyAccountWidget *self,
GDesktopAppInfo *desktop_info = NULL;
self->ui_details->widget = gtk_vbox_new (FALSE, 6);
- priv->table_common_settings = gtk_table_new (1, 2, FALSE);
+ priv->grid_common_settings = gtk_grid_new ();
provider = tp_account_get_storage_provider (account);
@@ -1256,7 +1246,7 @@ account_widget_build_external (EmpathyAccountWidget *self,
gtk_box_pack_start (GTK_BOX (self->ui_details->widget), bar,
FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (self->ui_details->widget),
- priv->table_common_settings, FALSE, TRUE, 0);
+ priv->grid_common_settings, FALSE, TRUE, 0);
gtk_widget_show_all (self->ui_details->widget);
@@ -1271,7 +1261,7 @@ account_widget_build_salut (EmpathyAccountWidget *self,
GtkWidget *expander_advanced;
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_settings", &priv->table_common_settings,
+ "grid_common_settings", &priv->grid_common_settings,
"vbox_salut_settings", &self->ui_details->widget,
"expander_advanced_settings", &expander_advanced,
NULL);
@@ -1310,7 +1300,7 @@ account_widget_build_irc (EmpathyAccountWidget *self,
else
{
priv->irc_network_chooser = empathy_account_widget_irc_build (self,
- filename, &priv->table_common_settings);
+ filename, &priv->grid_common_settings);
}
}
@@ -1320,7 +1310,7 @@ account_widget_build_sip (EmpathyAccountWidget *self,
{
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
empathy_account_widget_sip_build (self, filename,
- &priv->table_common_settings);
+ &priv->grid_common_settings);
if (priv->simple)
{
@@ -1362,7 +1352,7 @@ account_widget_build_msn (EmpathyAccountWidget *self,
else
{
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_msn_settings", &priv->table_common_settings,
+ "grid_common_msn_settings", &priv->grid_common_settings,
"vbox_msn_settings", &self->ui_details->widget,
NULL);
@@ -1565,7 +1555,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
/* Full widget for XMPP, Google Talk and Facebook*/
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_settings", &priv->table_common_settings,
+ "grid_common_settings", &priv->grid_common_settings,
"vbox_jabber_settings", &self->ui_details->widget,
"spinbutton_port", &spinbutton_port,
"checkbutton_ssl", &checkbutton_ssl,
@@ -1659,7 +1649,7 @@ account_widget_build_icq (EmpathyAccountWidget *self,
else
{
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_settings", &priv->table_common_settings,
+ "grid_common_settings", &priv->grid_common_settings,
"vbox_icq_settings", &self->ui_details->widget,
"spinbutton_port", &spinbutton_port,
NULL);
@@ -1705,7 +1695,7 @@ account_widget_build_aim (EmpathyAccountWidget *self,
else
{
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_settings", &priv->table_common_settings,
+ "grid_common_settings", &priv->grid_common_settings,
"vbox_aim_settings", &self->ui_details->widget,
"spinbutton_port", &spinbutton_port,
NULL);
@@ -1752,7 +1742,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self,
else
{
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_settings", &priv->table_common_settings,
+ "grid_common_settings", &priv->grid_common_settings,
"vbox_yahoo_settings", &self->ui_details->widget,
NULL);
@@ -1797,7 +1787,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self,
else
{
self->ui_details->gui = empathy_builder_get_file (filename,
- "table_common_groupwise_settings", &priv->table_common_settings,
+ "grid_common_groupwise_settings", &priv->grid_common_settings,
"vbox_groupwise_settings", &self->ui_details->widget,
NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 09:54:59 +0800