Finish merging registration dialog

4 files changed, 7 insertions, 5 deletions

diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 1dde3b3f..fac3dcd1 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -207,6 +207,7 @@ void GeneralHandler::guiWindowsLoaded()
 {
     partyTab = new PartyTab;
     inventoryWindow->setSplitAllowed(false);
+    RegisterDialog::setEmail(NULL);
     RegisterDialog::setGender(&netToken.sex);
     skillDialog->loadSkills("ea-skills.xml");
 
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 5e72f8fd..c0ca0a4e 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -33,8 +33,6 @@ struct LoginData
     std::string password;
     std::string newPassword;
     std::string updateHost;
-    std::string email;
-    std::string newEmail;
 
     bool remember;            /**< Whether to store the username. */
     bool registerLogin;       /**< Whether an account is being registered. */
@@ -45,8 +43,6 @@ struct LoginData
         password.clear();
         newPassword.clear();
         updateHost.clear();
-        email.clear();
-        newEmail.clear();
     }
 };
 
diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp
index 81bb46be..68f8c918 100644
--- a/src/net/tmwserv/generalhandler.cpp
+++ b/src/net/tmwserv/generalhandler.cpp
@@ -21,6 +21,7 @@
 
 #include "net/tmwserv/generalhandler.h"
 
+#include "gui/changeemaildialog.h"
 #include "gui/inventorywindow.h"
 #include "gui/partywindow.h"
 #include "gui/register.h"
@@ -61,6 +62,7 @@ Net::Connection *accountServerConnection = 0;
 
 namespace TmwServ {
 
+std::string userEmail = "";
 std::string netToken = "";
 ServerInfo gameServer;
 ServerInfo chatServer;
@@ -155,8 +157,10 @@ void GeneralHandler::tick()
 
 void GeneralHandler::guiWindowsLoaded()
 {
+    ChangeEmailDialog::setEmail(*userEmail);
     inventoryWindow->setSplitAllowed(true);
     partyWindow->clearPartyName();
+    RegisterDialog::setEmail(&userEmail);
     RegisterDialog::setGender(NULL);
     skillDialog->loadSkills("tmw-skills.xml");
     specialsWindow->loadSpecials("specials.xml");
diff --git a/src/net/tmwserv/loginhandler.cpp b/src/net/tmwserv/loginhandler.cpp
index 74b8abad..81079a3a 100644
--- a/src/net/tmwserv/loginhandler.cpp
+++ b/src/net/tmwserv/loginhandler.cpp
@@ -39,6 +39,7 @@ Net::LoginHandler *loginHandler;
 extern Net::Connection *accountServerConnection;
 
 namespace TmwServ {
+extern std::string userEmail;
 
 LoginHandler::LoginHandler()
 {
@@ -333,7 +334,7 @@ void LoginHandler::registerAccount(LoginData *loginData)
             0, // client version
             loginData->username,
             loginData->password,
-            loginData->email);
+            userEmail);
 }
 
 void LoginHandler::unregisterAccount(const std::string &username,