4 files changed, 102 insertions, 20 deletions
diff --git a/src/listeners/newpincodelistener.cpp b/src/listeners/newpincodelistener.cpp
new file mode 100644
index 000000000..ce5a32c90
--- /dev/null
+++ b/src/listeners/newpincodelistener.cpp
@@ -0,0 +1,48 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2018  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "listeners/newpincodelistener.h"
+
+#include "client.h"
+#include "pincodemanager.h"
+
+#include "gui/windows/pincodedialog.h"
+
+#include "debug.h"
+
+NewPincodeListener newPincodeListener;
+
+void NewPincodeListener::action(const ActionEvent &event)
+{
+    if (event.getId() == "ok")
+    {
+        const PincodeDialog *const dialog = dynamic_cast<PincodeDialog*>(
+            event.getSource());
+        if (dialog != nullptr)
+        {
+            const std::string pincode = dialog->getMsg();
+            pincodeManager.setNewPincode(pincode);
+        }
+    }
+    else
+    {
+        client->setState(State::SWITCH_LOGIN);
+    }
+}
diff --git a/src/listeners/pincodelistener.h b/src/listeners/newpincodelistener.h
index f32bf4ded..f010befc8 100644
--- a/src/listeners/pincodelistener.h
+++ b/src/listeners/newpincodelistener.h
@@ -18,25 +18,25 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LISTENERS_PINCODELISTENER_H
-#define LISTENERS_PINCODELISTENER_H
+#ifndef LISTENERS_NEWPINCODELISTENER_H
+#define LISTENERS_NEWPINCODELISTENER_H
 
 #include "listeners/actionlistener.h"
 
 #include "localconsts.h"
 
-class PincodeListener final : public ActionListener
+class NewPincodeListener final : public ActionListener
 {
     public:
-        PincodeListener() :
+        NewPincodeListener() :
             ActionListener()
         { }
 
-        A_DELETE_COPY(PincodeListener)
+        A_DELETE_COPY(NewPincodeListener)
 
         void action(const ActionEvent &event) override final;
 };
 
-extern PincodeListener pincodeListener;
+extern NewPincodeListener newPincodeListener;
 
-#endif  // LISTENERS_PINCODELISTENER_H
+#endif  // LISTENERS_NEWPINCODELISTENER_H
diff --git a/src/listeners/pincodelistener.cpp b/src/listeners/newpincoderetrylistener.cpp
index 5f810513d..d98b9bd84 100644
--- a/src/listeners/pincodelistener.cpp
+++ b/src/listeners/newpincoderetrylistener.cpp
@@ -18,23 +18,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "listeners/pincodelistener.h"
+#include "listeners/newpincoderetrylistener.h"
 
-#include "net/charserverhandler.h"
-
-#include "gui/windows/editdialog.h"
+#include "pincodemanager.h"
 
 #include "debug.h"
 
-PincodeListener pincodeListener;
+NewPincodeRetryListener newPincodeRetryListener;
 
-void PincodeListener::action(const ActionEvent &event)
+void NewPincodeRetryListener::action(const ActionEvent &event A_UNUSED)
 {
-    const EditDialog *const dialog = dynamic_cast<EditDialog*>(
-        event.getSource());
-    if (dialog != nullptr)
-    {
-        const std::string pincode = dialog->getMsg();
-        charServerHandler->setNewPincode(pincode);
-    }
+    pincodeManager.updateState();
 }
diff --git a/src/listeners/newpincoderetrylistener.h b/src/listeners/newpincoderetrylistener.h
new file mode 100644
index 000000000..cbb1e611d
--- /dev/null
+++ b/src/listeners/newpincoderetrylistener.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2018  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LISTENERS_NEWPINCODERETRYLISTENER_H
+#define LISTENERS_NEWPINCODERETRYLISTENER_H
+
+#include "listeners/actionlistener.h"
+
+#include "localconsts.h"
+
+class NewPincodeRetryListener final : public ActionListener
+{
+    public:
+        NewPincodeRetryListener() :
+            ActionListener()
+        { }
+
+        A_DELETE_COPY(NewPincodeRetryListener)
+
+        void action(const ActionEvent &event) override final;
+};
+
+extern NewPincodeRetryListener newPincodeRetryListener;
+
+#endif  // LISTENERS_NEWPINCODERETRYLISTENER_H