diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-03-08 12:29:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-03-08 12:29:10 +0300 |
commit | d1c4cb3675600137d0239ac7bdfc91062592804a (patch) | |
tree | e09c62c2e8a796bb745e0e3c2ed86810327ea3c5 /src/actions | |
parent | 905bfd0ad38d7101f99f38b00044d9f192cc664d (diff) | |
download | plus-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.gz plus-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.bz2 plus-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.xz plus-d1c4cb3675600137d0239ac7bdfc91062592804a.zip |
Move guild-kick from popup manager into actions.
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/chat.cpp | 30 | ||||
-rw-r--r-- | src/actions/chat.h | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp index 5014b24bc..2ac6ec0f1 100644 --- a/src/actions/chat.cpp +++ b/src/actions/chat.cpp @@ -456,6 +456,36 @@ impHandler(kickParty) return true; } +impHandler(kickGuild) +{ + if (!event.args.empty()) + { + if (localPlayer) + { + const Guild *const guild = localPlayer->getGuild(); + if (guild) + { + if (guild->getServerGuild()) + guildHandler->kick(guild->getMember(event.args), ""); +#ifdef TMWA_SUPPORT + else if (guildManager) + guildManager->kick(event.args); +#endif + } + } + } + else + { + if (event.tab) + { + // TRANSLATORS: party kick message + event.tab->chatLog(_("Please specify a name."), + ChatMsgType::BY_SERVER); + } + } + return true; +} + impHandler(addText) { if (chatWindow) diff --git a/src/actions/chat.h b/src/actions/chat.h index 1aa1778ef..9be293bb8 100644 --- a/src/actions/chat.h +++ b/src/actions/chat.h @@ -47,6 +47,7 @@ namespace Actions decHandler(me); decHandler(toggle); decHandler(kickParty); + decHandler(kickGuild); decHandler(addText); decHandler(clearChat); decHandler(chatGeneralTab); |