1 files changed, 13 insertions, 5 deletions

diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp
index 4a35929..3272a8a 100644
--- a/noncore/net/opieirc/ircchanneltab.cpp
+++ b/noncore/net/opieirc/ircchanneltab.cpp
@@ -9,2 +9,3 @@
 
+#include <opie2/odebug.h>
 QDict<QString> IRCChannelTab::m_queuedMessages (17);
@@ -43,7 +44,9 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW
     /* Construct the popup menu */
-    QPopupMenu *ctcpMenu = new QPopupMenu(m_list);
+    //QPopupMenu *ctcpMenu = new QPopupMenu(m_list);
     m_popup->insertItem(Resource::loadPixmap("opieirc/query"), tr("Query"), this, SLOT(popupQuery()));
-    ctcpMenu->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing()));
-    ctcpMenu->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion()));
-    ctcpMenu->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois()));
+    m_popup->insertSeparator();
+    m_popup->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing()));
+    m_popup->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion()));
+    m_popup->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois()));
+    //m_popup->insertItem(ctcpMenu, "CTCP");
     connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling()));
@@ -168,3 +171,4 @@ void IRCChannelTab::popupQuery() {
 void IRCChannelTab::popupPing() {
-  //HAHA, no wonder these don't work
+    if(m_list->currentItem() != -1)
+        m_parentTab->session()->sendCTCPPing(m_list->text(m_list->currentItem()));
 }
@@ -172,2 +176,4 @@ void IRCChannelTab::popupPing() {
 void IRCChannelTab::popupVersion() {
+    if(m_list->currentItem() != -1)
+        m_parentTab->session()->sendCTCPRequest(m_list->text(m_list->currentItem()), "VERSION", "");
 }
@@ -175,2 +181,4 @@ void IRCChannelTab::popupVersion() {
 void IRCChannelTab::popupWhois() {
+    if(m_list->currentItem() != -1)
+        m_parentTab->session()->whois(m_list->text(m_list->currentItem()));
 }