6 files changed, 83 insertions, 18 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29a0b0061..1f9171258 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -609,6 +609,8 @@ SET(SRCS
     listeners/arrowslistener.h
     listeners/attributelistener.cpp
     listeners/attributelistener.h
+    listeners/awaylistener.cpp
+    listeners/awaylistener.h
     listeners/baselistener.hpp
     actormanager.cpp
     actormanager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d31b40cd..77971c35b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -698,6 +698,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      listeners/arrowslistener.h \
 	      listeners/attributelistener.cpp \
 	      listeners/attributelistener.h \
+	      listeners/awaylistener.cpp \
+	      listeners/awaylistener.h \
 	      listeners/baselistener.hpp \
 	      actormanager.cpp \
 	      actormanager.h \
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index b64c494b7..37a960dae 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -73,6 +73,7 @@
 #include "resources/map/mapitem.h"
 #include "resources/map/speciallayer.h"
 
+#include "listeners/awaylistener.h"
 #include "listeners/updatestatuslistener.h"
 
 #include "utils/delete2.h"
@@ -3813,15 +3814,3 @@ void LocalPlayer::setTestParticle(const std::string &fileName,
             mTestParticleHash = UpdaterWindow::getFileHash(mTestParticleName);
     }
 }
-
-void AwayListener::action(const ActionEvent &event)
-{
-    if (event.getId() == "ok" && player_node && player_node->getAway())
-    {
-        player_node->changeAwayMode();
-        player_node->updateStatus();
-        if (outfitWindow)
-            outfitWindow->unwearAwayOutfit();
-        UpdateStatusListener::distributeEvent();
-    }
-}
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 4fa3e8328..a8fd829d3 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -36,17 +36,12 @@
 
 #include "localconsts.h"
 
+class AwayListener;
 class ChatTab;
 class FloorItem;
 class Map;
 class OkDialog;
 
-class AwayListener final : public ActionListener
-{
-    public:
-        void action(const ActionEvent &event) override final;
-};
-
 /**
  * Reasons an item can fail to be picked up.
  */
diff --git a/src/listeners/awaylistener.cpp b/src/listeners/awaylistener.cpp
new file mode 100644
index 000000000..1fb7dd4a9
--- /dev/null
+++ b/src/listeners/awaylistener.cpp
@@ -0,0 +1,43 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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/awaylistener.h"
+
+#include "being/localplayer.h"
+
+#include "gui/windows/outfitwindow.h"
+
+#include "listeners/updatestatuslistener.h"
+
+#include "debug.h"
+
+void AwayListener::action(const ActionEvent &event)
+{
+    if (event.getId() == "ok" && player_node && player_node->getAway())
+    {
+        player_node->changeAwayMode();
+        player_node->updateStatus();
+        if (outfitWindow)
+            outfitWindow->unwearAwayOutfit();
+        UpdateStatusListener::distributeEvent();
+    }
+}
diff --git a/src/listeners/awaylistener.h b/src/listeners/awaylistener.h
new file mode 100644
index 000000000..8130ef84e
--- /dev/null
+++ b/src/listeners/awaylistener.h
@@ -0,0 +1,34 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  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_AWAYLISTENER_H
+#define LISTENERS_AWAYLISTENER_H
+
+#include "listeners/actionlistener.h"
+
+#include "localconsts.h"
+
+class AwayListener final : public ActionListener
+{
+    public:
+        void action(const ActionEvent &event) override final;
+};
+
+#endif  // LISTENERS_AWAYLISTENER_H