From 9f39b5c84d0b244e093380e5ad7d53c2a21d2f34 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 26 Aug 2014 23:35:31 +0300
Subject: Move chat command /serverunignoreall into actions.

---
 src/actions/actions.cpp    | 6 ++++++
 src/actions/actions.h      | 1 +
 src/commands.cpp           | 6 ------
 src/commands.h             | 5 +----
 src/input/inputaction.h    | 1 +
 src/input/inputactionmap.h | 9 +++++++++
 src/input/pages/chat.cpp   | 6 ++++++
 7 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 46a3d74d8..2514ac180 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -878,4 +878,10 @@ impHandler0(serverIgnoreAll)
     return true;
 }
 
+impHandler0(serverUnIgnoreAll)
+{
+    Net::getChatHandler()->unIgnoreAll();
+    return true;
+}
+
 }  // namespace Actions
diff --git a/src/actions/actions.h b/src/actions/actions.h
index a731574bb..e3e6a2c02 100644
--- a/src/actions/actions.h
+++ b/src/actions/actions.h
@@ -70,6 +70,7 @@ namespace Actions
     decHandler(uptime);
     decHandler(dump);
     decHandler(serverIgnoreAll);
+    decHandler(serverUnIgnoreAll);
 }  // namespace Actions
 
 #undef decHandler
diff --git a/src/commands.cpp b/src/commands.cpp
index b5491a805..608be620f 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -157,12 +157,6 @@ impHandler(hack)
     return true;
 }
 
-impHandler0(serverUnIgnoreAll)
-{
-    Net::getChatHandler()->unIgnoreAll();
-    return true;
-}
-
 impHandler(dumpGraphics)
 {
     std::string str = strprintf("%s,%s,%dX%dX%d,", PACKAGE_OS, SMALL_VERSION,
diff --git a/src/commands.h b/src/commands.h
index d90974eaf..6b7ec8401 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -52,7 +52,6 @@ struct CommandInfo final
 namespace Commands
 {
     decHandler(hack);
-    decHandler(serverUnIgnoreAll);
     decHandler(setDrop);
     decHandler(error) __attribute__ ((noreturn));
     decHandler(url);
@@ -86,8 +85,7 @@ namespace Commands
 
 enum
 {
-    COMMAND_SERVERUNIGNOREALL = 0,
-    COMMAND_SETDROP,
+    COMMAND_SETDROP = 0,
     COMMAND_ERROR,
     COMMAND_DUMPG,
     COMMAND_DUMPE,
@@ -120,7 +118,6 @@ enum
 
 static const CommandInfo commands[] =
 {
-    {"serverunignoreall", &Commands::serverUnIgnoreAll, -1, false},
     {"setdrop", &Commands::setDrop, -1, true},
     {"error", &Commands::error, -1, false},
     {"dumpg", &Commands::dumpGraphics, -1, false},
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 572333a3d..cb79d84a2 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -395,6 +395,7 @@ namespace InputAction
         ADD_IGNORE_ATTACK,
         DUMP,
         SERVER_IGNORE_ALL,
+        SERVER_UNIGNORE_ALL,
         TOTAL
     };
 }  // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 82973a0cc..b0976916c 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3324,6 +3324,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
         InputAction::NO_VALUE, 50,
         InputCondition::INGAME,
         "serverignoreall",
+        false},
+    {"keyServerUnIgnoreAll",
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        Input::GRP_DEFAULT,
+        &Actions::serverUnIgnoreAll,
+        InputAction::NO_VALUE, 50,
+        InputCondition::INGAME,
+        "serverunignoreall",
         false}
 };
 
diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp
index 27e239cce..749752ab6 100644
--- a/src/input/pages/chat.cpp
+++ b/src/input/pages/chat.cpp
@@ -90,6 +90,12 @@ SetupActionData setupActionDataChat[] =
         InputAction::SERVER_IGNORE_ALL,
         "",
     },
+    {
+        // TRANSLATORS: input action name
+        N_("Unignore all whispers on server side"),
+        InputAction::SERVER_UNIGNORE_ALL,
+        "",
+    },
     {
         // TRANSLATORS: input action name
         N_("Previous chat line"),
-- 
cgit v1.2.3-70-g09d2