Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 568e0613e..cc5caca60 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -46,10 +46,10 @@
 
 #include "debug.h"
 
-UnRegisterDialog::UnRegisterDialog(LoginData *loginData):
-    Window(_("Unregister"), true),
+UnRegisterDialog::UnRegisterDialog(LoginData *data):
+    Window(_("Unregister"), true, 0, "unregister.xml"),
     mWrongDataNoticeListener(new WrongDataNoticeListener),
-    mLoginData(loginData)
+    mLoginData(data)
 {
     gcn::Label *userLabel = new Label(strprintf(_("Name: %s"), mLoginData->
                                                 username.c_str()));
@@ -108,7 +108,7 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event)
         logger->log("UnregisterDialog::unregistered, Username is %s",
                      username.c_str());
 
-        std::stringstream errorMessage;
+        std::stringstream errorMsg;
         bool error = false;
 
         unsigned int min = Net::getLoginHandler()->getMinPasswordLength();
@@ -118,15 +118,15 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event)
         if (password.length() < min)
         {
             // Pass too short
-            errorMessage << strprintf(_("The password needs to be at least %d "
-                                        "characters long."), min);
+            errorMsg << strprintf(_("The password needs to be at least %d "
+                "characters long."), min);
             error = true;
         }
         else if (password.length() > max - 1)
         {
             // Pass too long
-            errorMessage << strprintf(_("The password needs to be less than "
-                                        "%d characters long."), max);
+            errorMsg << strprintf(_("The password needs to be less than "
+                "%d characters long."), max);
             error = true;
         }
 
@@ -134,7 +134,7 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event)
         {
             mWrongDataNoticeListener->setTarget(this->mPasswordField);
 
-            OkDialog *dlg = new OkDialog(_("Error"), errorMessage.str());
+            OkDialog *dlg = new OkDialog(_("Error"), errorMsg.str());
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else