aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-01-24 20:39:15 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-01-24 21:59:28 +0800
commitce51e074a4b2bf286980cad803239bd5e96e749b (patch)
tree48b2778b1b4931e52a05466ad6e4342036f0fff8
parentc06e987f5bccc63f2cf54567850d36f59a51a5f6 (diff)
downloadgsoc2013-empathy-ce51e074a4b2bf286980cad803239bd5e96e749b.tar
gsoc2013-empathy-ce51e074a4b2bf286980cad803239bd5e96e749b.tar.gz
gsoc2013-empathy-ce51e074a4b2bf286980cad803239bd5e96e749b.tar.bz2
gsoc2013-empathy-ce51e074a4b2bf286980cad803239bd5e96e749b.tar.lz
gsoc2013-empathy-ce51e074a4b2bf286980cad803239bd5e96e749b.tar.xz
gsoc2013-empathy-ce51e074a4b2bf286980cad803239bd5e96e749b.tar.zst
gsoc2013-empathy-ce51e074a4b2bf286980cad803239bd5e96e749b.zip
account-widget-yahoo: remove server field (#634853)
-rw-r--r--libempathy-gtk/empathy-account-widget-yahoo.ui36
-rw-r--r--libempathy-gtk/empathy-account-widget.c1
2 files changed, 4 insertions, 33 deletions
diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
index 16044f3c8..e02ace9fc 100644
--- a/libempathy-gtk/empathy-account-widget-yahoo.ui
+++ b/libempathy-gtk/empathy-account-widget-yahoo.ui
@@ -130,7 +130,7 @@
<child>
<object class="GtkTable" id="table_advanced_settings">
<property name="visible">True</property>
- <property name="n_rows">5</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>
@@ -206,21 +206,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_server">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Server:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_server</property>
- </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>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="label_port">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -229,22 +214,9 @@
<property name="mnemonic_widget">spinbutton_port</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_server">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </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>
@@ -259,8 +231,8 @@
<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">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index b6e84aa91..f53df39d3 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1683,7 +1683,6 @@ account_widget_build_yahoo (EmpathyAccountWidget *self,
empathy_account_widget_handle_params (self,
"entry_id", "account",
"entry_password", "password",
- "entry_server", "server",
"entry_locale", "room-list-locale",
"entry_charset", "charset",
"spinbutton_port", "port",