aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-13 22:23:52 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-13 22:24:39 +0800
commit1cb32224bfc3f633057cb60229476334909f7d4f (patch)
tree20bc91d485040ccfd46912953145bc5d131e590e /libempathy-gtk
parent3cc5f86c16058e7aaaf95348d0c5277e05c9ed97 (diff)
downloadgsoc2013-empathy-1cb32224bfc3f633057cb60229476334909f7d4f.tar
gsoc2013-empathy-1cb32224bfc3f633057cb60229476334909f7d4f.tar.gz
gsoc2013-empathy-1cb32224bfc3f633057cb60229476334909f7d4f.tar.bz2
gsoc2013-empathy-1cb32224bfc3f633057cb60229476334909f7d4f.tar.lz
gsoc2013-empathy-1cb32224bfc3f633057cb60229476334909f7d4f.tar.xz
gsoc2013-empathy-1cb32224bfc3f633057cb60229476334909f7d4f.tar.zst
gsoc2013-empathy-1cb32224bfc3f633057cb60229476334909f7d4f.zip
Remove "Use Yahoo Japan" label (#609484)
It's not a valid connection param any more. Yahoo Japan has its own protocol now.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-account-widget-yahoo.ui20
-rw-r--r--libempathy-gtk/empathy-account-widget.c1
2 files changed, 1 insertions, 20 deletions
diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
index ad4f527ed..acc60de74 100644
--- a/libempathy-gtk/empathy-account-widget-yahoo.ui
+++ b/libempathy-gtk/empathy-account-widget-yahoo.ui
@@ -108,11 +108,10 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkTable" id="table_advanced_settings">
<property name="visible">True</property>
- <property name="n_rows">6</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>
@@ -246,23 +245,6 @@
<property name="y_options"></property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_yahoojp">
- <property name="label" translatable="yes">Use _Yahoo! Japan</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</object>
<packing>
<property name="position">0</property>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index cd55b2a25..a32666325 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1333,7 +1333,6 @@ account_widget_build_yahoo (EmpathyAccountWidget *self,
"entry_locale", "room-list-locale",
"entry_charset", "charset",
"spinbutton_port", "port",
- "checkbutton_yahoojp", "yahoojp",
"checkbutton_ignore_invites", "ignore-invites",
NULL);