X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=5470d69f1b631539d4c6fb88f52ca37e3010993f;hp=71bee86ca1c6ce78c354dd3614f6bf58bd78a395;hb=1d3902f7006b2585479561d99e794285471a0329;hpb=ef450b6502abfcad52fec7581a3d807a5386512f;ds=sidebyside

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 71bee86c..5470d69f 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -124,10 +124,9 @@ void NickView::showContextMenu(const QPoint & pos ) {
   QAction *deVoiceAction = modeMenu->addAction(tr("Devoice %1").arg(nick));
 
   QMenu *kickBanMenu = nickContextMenu.addMenu(tr("Kick/Ban"));
-  //TODO: add kick message from network identity (kick reason)
   QAction *kickAction = kickBanMenu->addAction(tr("Kick %1").arg(nick));
+  QAction *banAction = kickBanMenu->addAction(tr("Ban %1").arg(nick));
   QAction *kickBanAction = kickBanMenu->addAction(tr("Kickban %1").arg(nick));
-  kickBanMenu->setEnabled(false);
   QAction *ignoreAction = nickContextMenu.addAction(tr("Ignore"));
   ignoreAction->setEnabled(false);
 
@@ -152,7 +151,9 @@ void NickView::showContextMenu(const QPoint & pos ) {
   else if(action == deVoiceAction)  { executeCommand(bufferInfo, QString("/DEVOICE %1").arg(nick)); }
 
   else if(action == kickAction)     { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); }
-  else if(action == kickBanAction)  { executeCommand(bufferInfo, QString("/KICKBAN %1").arg(nick)); }
+  else if(action == banAction)      { executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }
+  else if(action == kickBanAction)  { executeCommand(bufferInfo, QString("/KICK %1").arg(nick)); 
+                                      executeCommand(bufferInfo, QString("/BAN %1").arg(nick)); }
   else if(action == queryAction)    { executeCommand(bufferInfo, QString("/QUERY %1").arg(nick)); }
 
 }