[empathy] account-widget-sip: add subsections in the advanced section
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy] account-widget-sip: add subsections in the advanced section
- Date: Mon, 23 Nov 2009 15:17:31 +0000 (UTC)
commit 6df549df80d1a2cede9a09d0523a09c892900640
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Nov 17 15:45:07 2009 +0000
account-widget-sip: add subsections in the advanced section
libempathy-gtk/empathy-account-widget-sip.c | 2 +-
libempathy-gtk/empathy-account-widget-sip.ui | 125 ++++++++++++++++++--------
2 files changed, 90 insertions(+), 37 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 2c3dbf3..0b79b61 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -196,7 +196,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
"transport");
gtk_table_attach_defaults (GTK_TABLE (table_advanced),
- settings->combobox_transport, 1, 2, 6, 7);
+ settings->combobox_transport, 1, 2, 13, 14);
gtk_widget_show (settings->combobox_transport);
diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
index 1bfeafe..5b18023 100644
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ b/libempathy-gtk/empathy-account-widget-sip.ui
@@ -98,9 +98,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label_username_example">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -115,6 +112,9 @@
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -130,11 +130,12 @@
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table_advanced_sip_settings">
<property name="visible">True</property>
- <property name="n_rows">11</property>
+ <property name="n_rows">15</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
@@ -147,8 +148,8 @@
<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="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -159,8 +160,8 @@
<property name="mnemonic_widget">spinbutton_stun-port</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</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>
@@ -173,8 +174,8 @@
<property name="mnemonic_widget">entry_stun-server</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_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>
@@ -190,8 +191,8 @@
<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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -205,6 +206,8 @@
</object>
<packing>
<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>
@@ -216,8 +219,8 @@
<property name="label" translatable="yes">Authentication username:</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
</packing>
</child>
<child>
@@ -231,8 +234,8 @@ username.</property>
<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="top_attach">12</property>
+ <property name="bottom_attach">13</property>
</packing>
</child>
<child>
@@ -242,8 +245,8 @@ username.</property>
<property name="label" translatable="yes">Proxy Server:</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
</packing>
</child>
<child>
@@ -256,8 +259,8 @@ username.</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
</packing>
</child>
<child>
@@ -267,8 +270,8 @@ username.</property>
<property name="label" translatable="yes">Proxy Port:</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
</packing>
</child>
<child>
@@ -283,8 +286,8 @@ username.</property>
<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>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
</packing>
</child>
<child>
@@ -294,8 +297,8 @@ username.</property>
<property name="label" translatable="yes">Transport:</property>
</object>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">13</property>
+ <property name="bottom_attach">14</property>
</packing>
</child>
<child>
@@ -309,8 +312,8 @@ username.</property>
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">14</property>
+ <property name="bottom_attach">15</property>
</packing>
</child>
<child>
@@ -324,8 +327,8 @@ username.</property>
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
<child>
@@ -340,12 +343,6 @@ username.</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label_keepalive-interval">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -370,6 +367,62 @@ username.</property>
<property name="bottom_attach">11</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label_nat_traversal">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>NAT Traversal</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_proxy">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Proxy</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_keep_alive">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Keep-Alive</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_misc">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Misc</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">11</property>
+ <property name="bottom_attach">12</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
