From bfa0ffd5db38174555992c4a21274be41aad753f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 1 May 2017 18:02:17 +0300
Subject: Remove ServerFeatures haveAccountOtherGender because it always false.

---
 src/gui/windows/registerdialog.cpp | 18 ++----------------
 src/gui/windows/registerdialog.h   |  1 -
 2 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index 79884b92c..c1940eb8d 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -64,7 +64,6 @@ RegisterDialog::RegisterDialog(LoginData &data) :
     mCancelButton(new Button(this, _("Cancel"), "cancel", this)),
     mMaleButton(nullptr),
     mFemaleButton(nullptr),
-    mOtherButton(nullptr),
     mWrongDataNoticeListener(new WrongDataNoticeListener)
 {
     setCloseButton(true);
@@ -94,19 +93,8 @@ RegisterDialog::RegisterDialog(LoginData &data) :
         mMaleButton = new RadioButton(this, _("Male"), "sex", true);
         // TRANSLATORS: register dialog. button.
         mFemaleButton = new RadioButton(this, _("Female"), "sex", false);
-        if (serverFeatures->haveAccountOtherGender())
-        {
-            // TRANSLATORS: register dialog. button.
-            mOtherButton = new RadioButton(this, _("Other"), "sex", false);
-            placer(0, row, mMaleButton);
-            placer(1, row, mFemaleButton);
-            placer(2, row, mOtherButton);
-        }
-        else
-        {
-            placer(1, row, mMaleButton);
-            placer(2, row, mFemaleButton);
-        }
+        placer(1, row, mMaleButton);
+        placer(2, row, mFemaleButton);
 
         row++;
     }
@@ -271,8 +259,6 @@ void RegisterDialog::action(const ActionEvent &event)
             {
                 if (mFemaleButton && mFemaleButton->isSelected())
                     mLoginData->gender = Gender::FEMALE;
-                else if (mOtherButton && mOtherButton->isSelected())
-                    mLoginData->gender = Gender::OTHER;
                 else
                     mLoginData->gender = Gender::MALE;
             }
diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h
index cd2ec12c2..d0d0d821a 100644
--- a/src/gui/windows/registerdialog.h
+++ b/src/gui/windows/registerdialog.h
@@ -89,7 +89,6 @@ class RegisterDialog final : public Window,
         Button *mCancelButton A_NONNULLPOINTER;
         RadioButton *mMaleButton;
         RadioButton *mFemaleButton;
-        RadioButton *mOtherButton;
         WrongDataNoticeListener *mWrongDataNoticeListener A_NONNULLPOINTER;
 };
 
-- 
cgit v1.2.3-60-g2f50