Replaced setNetworkOptions with LoginHandler::supportedOptionalActions

Better to ask when needed that rely on static booleans to be set from
somewhere. Also tried to fix the layouting a bit, but it's still not
perfect.

1 files changed, 15 insertions, 16 deletions

diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index e1c8071e..0bb8e27f 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -36,6 +36,10 @@ class LocalPlayer;
 class LoginData;
 class PlayerBox;
 
+namespace Net {
+class CharHandler;
+}
+
 /**
  * Character selection dialog.
  *
@@ -58,34 +62,29 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 
         void chooseSelected();
 
-        static void setNetworkOptions(bool allowUnregister,
-                                      bool allowChangeEmail);
-
     private:
+        /**
+         * Communicate character deletion to the server.
+         */
+        void attemptCharDelete();
+
+        /**
+         * Communicate character selection to the server.
+         */
+        void attemptCharSelect();
+
         LockedArray<LocalPlayer*> *mCharInfo;
 
         gcn::Label *mAccountNameLabel;
 
         gcn::Button *mSwitchLoginButton;
         gcn::Button *mChangePasswordButton;
-        gcn::Button *mChangeEmailButton;
-        gcn::Button *mUnregisterButton;
 
         CharEntry *mCharEntries[MAX_CHARACTER_COUNT];
 
         LoginData *mLoginData;
 
-        /**
-         * Communicate character deletion to the server.
-         */
-        void attemptCharDelete();
-
-        /**
-         * Communicate character selection to the server.
-         */
-        void attemptCharSelect();
-
-        static bool doAllowUnregister, doAllowChangeEmail;
+        Net::CharHandler *mCharHandler;
 };
 
 #endif