From 59d14a65cf36efcae7aecbd0af02efc30257ec97 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 11 Dec 2014 21:43:25 +0300
Subject: Remove "ignore" popup menu handler.

---
 src/gui/popups/popupmenu.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'src/gui/popups/popupmenu.cpp')

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 30eb24ff4..95f639831 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -979,19 +979,8 @@ void PopupMenu::handleLink(const std::string &link,
     if (actorManager)
         being = actorManager->findBeing(mBeingId);
 
-    if (link == "ignore" && being &&
+    if (link == "blacklist" && being &&
         being->getType() == ActorType::Player)
-    {
-        player_relations.setRelation(being->getName(),
-                                     PlayerRelation::IGNORED);
-    }
-    else if (link == "ignore" && !mNick.empty())
-    {
-        player_relations.setRelation(mNick, PlayerRelation::IGNORED);
-    }
-
-    else if (link == "blacklist" && being &&
-             being->getType() == ActorType::Player)
     {
         player_relations.setRelation(being->getName(),
             PlayerRelation::BLACKLISTED);
@@ -2628,7 +2617,7 @@ void PopupMenu::addNormalRelations()
     mBrowserBox->addRow("disregard", _("Disregard"));
     // TRANSLATORS: popup menu item
     // TRANSLATORS: add player to ignore list
-    mBrowserBox->addRow("ignore", _("Ignore"));
+    mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
     // TRANSLATORS: popup menu item
     // TRANSLATORS: add player to black list
     mBrowserBox->addRow("blacklist", _("Black list"));
@@ -2664,7 +2653,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
             mBrowserBox->addRow("disregard", _("Disregard"));
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add player to ignore list
-            mBrowserBox->addRow("ignore", _("Ignore"));
+            mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add player to enemy list
             mBrowserBox->addRow("enemy", _("Set as enemy"));
@@ -2679,7 +2668,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
             mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add player to completle ignore list
-            mBrowserBox->addRow("ignore", _("Completely ignore"));
+            mBrowserBox->addRow("/ignore 'NAME'", _("Completely ignore"));
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add player to erased list
             mBrowserBox->addRow("erase", _("Erase"));
@@ -2703,7 +2692,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
             mBrowserBox->addRow("disregard", _("Disregard"));
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add player to ignore list
-            mBrowserBox->addRow("ignore", _("Ignore"));
+            mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add player to black list
             mBrowserBox->addRow("blacklist", _("Black list"));
@@ -2721,7 +2710,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
             mBrowserBox->addRow("disregard", _("Disregard"));
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add player to ignore list
-            mBrowserBox->addRow("ignore", _("Completely ignore"));
+            mBrowserBox->addRow("/ignore 'NAME'", _("Completely ignore"));
             break;
 
         default:
-- 
cgit v1.2.3-60-g2f50