Remove "Use Yahoo Japan" label (#609484)

It's not a valid connection param any more. Yahoo Japan has its own protocol
now.

diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
index ad4f527ed71f49e349d5dc14aad80b5c85bd7a75..acc60de7471533b4ee3b90d27a3ab9412ab3b03d 100644 (file)
--- 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 cd55b2a2512c4535607640aaa8b5e6b92cdb0b1f..a32666325511cf8ca5e501061d175e461760ae36 100644 (file)
--- 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);