18 files changed, 148 insertions, 21 deletions

diff --git a/noncore/net/opieirc/ircchannel.cpp b/noncore/net/opieirc/ircchannel.cpp
index 71ec03b..9814a26 100644
--- a/noncore/net/opieirc/ircchannel.cpp
+++ b/noncore/net/opieirc/ircchannel.cpp
@@ -3,12 +3,17 @@
 
 IRCChannel::IRCChannel(QString channelname) {
     m_hasPeople = FALSE;
     m_channelname = channelname;
 }
 
+IRCChannel::~IRCChannel() {
+    /* We want this to get deleted */
+    m_people.setAutoDelete(TRUE);
+}
+
 QString IRCChannel::channelname() {
     return m_channelname;
 }
 
 bool IRCChannel::hasPeople() {
     return m_hasPeople;
diff --git a/noncore/net/opieirc/ircchannel.h b/noncore/net/opieirc/ircchannel.h
index c800b99..e78f182 100644
--- a/noncore/net/opieirc/ircchannel.h
+++ b/noncore/net/opieirc/ircchannel.h
@@ -44,12 +44,13 @@ typedef struct IRCChannelPerson {
    of an IRC channel. It basically acts as a container
    for IRCChannelPersons */
 class IRCChannel : public QObject {
     Q_OBJECT
 public:
     IRCChannel(QString channelname);
+    ~IRCChannel();
    
     void addPerson(IRCChannelPerson *person);
     void removePerson(IRCChannelPerson *person);
     IRCChannelPerson *getPerson(QString nickname);
     QListIterator<IRCChannelPerson> people();
 
diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp
index c96a365..754442a 100644
--- a/noncore/net/opieirc/ircchanneltab.cpp
+++ b/noncore/net/opieirc/ircchanneltab.cpp
@@ -35,18 +35,30 @@ void IRCChannelTab::appendText(QString text) {
 
 IRCChannelTab::~IRCChannelTab() {
     m_parentTab->removeChannelTab(this);
 }
 
 void IRCChannelTab::processCommand() {
-    if (m_field->text().length()>0) {
+    QString text = m_field->text();
+    if (text.length()>0) {
+        if (session()->isSessionActive()) {
+            if (text.startsWith("/") && !text.startsWith("//")) {
+                /* Command mode */
+                m_parentTab->executeCommand(this, text);;
+            } else {
+                if (session()->isSessionActive()) {
         session()->sendMessage(m_channel, m_field->text());
         appendText("&lt;<font color=\"#dd0000\">"+m_parentTab->server()->nick()+"</font>&gt; "+m_field->text()+"<br>");
-        m_field->clear();
     }
 }
+        } else {
+            appendText("<font color=\"#ff0000\">"+tr("Disconnected")+"</font><br>");
+        }
+    }
+    m_field->clear();
+}
 
 void IRCChannelTab::toggleList() {
     if (m_listVisible) {
         m_list->setMaximumWidth(0);
         m_listButton->setText("<");
     } else {
@@ -62,13 +74,17 @@ QString IRCChannelTab::title() {
 
 IRCSession *IRCChannelTab::session() {
     return m_parentTab->session();
 }
 
 void IRCChannelTab::remove() {
+    if (session()->isSessionActive()) {
     session()->part(m_channel);
+    } else {
+        m_mainWindow->killTab(this);
+    }
 }
 
 IRCChannel *IRCChannelTab::channel() {
     return m_channel;
 }
 
diff --git a/noncore/net/opieirc/ircconnection.cpp b/noncore/net/opieirc/ircconnection.cpp
index 02c4897..5eb0cf2 100644
--- a/noncore/net/opieirc/ircconnection.cpp
+++ b/noncore/net/opieirc/ircconnection.cpp
@@ -57,12 +57,20 @@ void IRCConnection::login() {
 
 /* Called when data arrives on the socket */
 void IRCConnection::dataReady() {
     while(m_socket->canReadLine()) {
         IRCMessage message(m_socket->readLine());
         if (!m_loggedIn && message.isNumerical() && message.commandNumber() == 1) {
+            /* Now autojoin all channels specified inside the server profile */
+            QStringList channels = QStringList::split(QChar(','), m_server->channels());
+            for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) {
+                QString channelName = (*it).stripWhiteSpace();
+                if (channelName.startsWith("#")) {
+                    sendLine("JOIN "+ channelName); 
+                }
+            }
             m_loggedIn = TRUE;
             emit outputReady(IRCOutput(OUTPUT_CLIENTMESSAGE, tr("Successfully logged in.")));
         }
         emit messageArrived(&message);
     }
 }
diff --git a/noncore/net/opieirc/ircmessage.cpp b/noncore/net/opieirc/ircmessage.cpp
index 74e9c6f..9c2869c 100644
--- a/noncore/net/opieirc/ircmessage.cpp
+++ b/noncore/net/opieirc/ircmessage.cpp
@@ -21,24 +21,27 @@ IRCMessage::IRCMessage(QString line) {
         m_command = temp.upper();
         m_allParameters = line.right(line.length() - m_prefix.length() - m_command.length() - 3);
     } else {
         m_command = temp.upper();
         m_allParameters = line.right(line.length() - m_command.length() - 1);
     }
+    
     /* Create a list of all parameters */
     while(!(stream.atEnd())) {
         stream >> temp;
         if (temp.startsWith(":")) {
             /* last parameter */
             m_trailing = line.right(line.length() - line.find(QChar(':'), 1) - 1);
             m_parameters << m_trailing;
             break;
         } else {
             m_parameters << temp;
         }
     }
+
+    
     m_commandNumber = m_command.toInt(&m_isNumerical);
     /* Is this a CTCP command */
     if ((m_command == "PRIVMSG" || m_command == "NOTICE") && m_trailing.length()>0 && m_trailing.left(1) == QChar(1)) {
         m_ctcp = TRUE;
         /* Strip CTCP \001 characters */
         m_allParameters = m_allParameters.replace(QRegExp(QChar(1)), "");
diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index a2be5a4..4038673 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -23,12 +23,13 @@ IRCLiteralMessageParserStruct IRCMessageParser::literalParserProcTable[] = {
 IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = { 
     { "PING",    FUNC(parseCTCPPing) },
     { "VERSION", FUNC(parseCTCPVersion) },
     { "ACTION",  FUNC(parseCTCPAction) },
     { 0 , 0 }
 };
+
 /* Lookup table for numerical commands */
 IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = { 
     { 1,   FUNC(parseNumerical001) },           // RPL_WELCOME
     { 2,   FUNC(parseNumerical002) },           // RPL_YOURHOST
     { 3,   FUNC(parseNumerical003) },           // RPL_CREATED
     { 4,   FUNC(parseNumerical004) },           // RPL_MYINFO
@@ -225,17 +226,19 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) {
         QList<IRCChannel> channels;
         m_session->getChannelsByPerson(person, channels);
         QListIterator<IRCChannel> it(channels);
         for (;it.current(); ++it) { 
             IRCChannelPerson *chanperson = it.current()->getPerson(mask.nick());
             it.current()->removePerson(chanperson);
+            delete chanperson;
         }
         m_session->removePerson(person);
         IRCOutput output(OUTPUT_QUIT, mask.nick() + tr(" has quit ") + "(" + message->param(0) + ")");
         output.addParam(person);
         emit outputReady(output);
+        delete person;
     } else {
          emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person quit - desynchronized?")));
     }
 }
 
 void IRCMessageParser::parseLiteralError(IRCMessage *message) {
diff --git a/noncore/net/opieirc/ircoutput.cpp b/noncore/net/opieirc/ircoutput.cpp
index aa57d86..878bc9b 100644
--- a/noncore/net/opieirc/ircoutput.cpp
+++ b/noncore/net/opieirc/ircoutput.cpp
@@ -10,12 +10,19 @@ IRCOutputType IRCOutput::type() {
 }
 
 QString IRCOutput::message() {
     return m_message;
 }
 
+QString IRCOutput::htmlMessage() {
+    QString htmlMessage =m_message.replace(QRegExp("&"), "&amp;");
+    htmlMessage = htmlMessage.replace(QRegExp(">"), "&gt;");
+    htmlMessage = htmlMessage.replace(QRegExp("<"), "&lt;");
+    return htmlMessage;
+}
+
 void IRCOutput::addParam(void *data) {
     m_parameters.append(data);
 }
 
 void *IRCOutput::getParam(int index) {
     return m_parameters.at(index);
diff --git a/noncore/net/opieirc/ircoutput.h b/noncore/net/opieirc/ircoutput.h
index 4b757ed..72361d4 100644
--- a/noncore/net/opieirc/ircoutput.h
+++ b/noncore/net/opieirc/ircoutput.h
@@ -57,12 +57,14 @@ public:
     /* Used to add a parameter to this IRCOutput. Parameters are dependent
        on which IRCOutputType we are using (see above) */
     void addParam(void *data);
     
     IRCOutputType type();
     QString message();
+    /* Return the message with all HTML code escaped (for example &lt; instead of '<') */
+    QString htmlMessage();
     void *getParam(int index);
 protected:
     IRCOutputType      m_type;
     QString            m_message;
     QList<void>        m_parameters;
 };
diff --git a/noncore/net/opieirc/ircserver.cpp b/noncore/net/opieirc/ircserver.cpp
index e16e2b2..e27e41d 100644
--- a/noncore/net/opieirc/ircserver.cpp
+++ b/noncore/net/opieirc/ircserver.cpp
@@ -1,12 +1,14 @@
 #include "ircserver.h"
 
 IRCServer::IRCServer() {
     m_port = 6667;
 }
 
+/* Setter implementations */
+
 void IRCServer::setHostname(QString hostname) {
     m_hostname = hostname;
 }
 
 void IRCServer::setName(QString name) {
     m_name = name;
@@ -29,12 +31,18 @@ void IRCServer::setNick(QString nick) {
 }
 
 void IRCServer::setRealname(QString realname) {
     m_realname = realname;
 }
 
+void IRCServer::setChannels(QString channels) {
+    m_channels = channels;
+}
+
+/* Getter implementations */
+
 QString IRCServer::hostname() {
     return m_hostname;
 }
 
 QString IRCServer::name() {
     return m_name;
@@ -57,6 +65,10 @@ QString IRCServer::nick() {
 }
 
 QString IRCServer::realname() {
     return m_realname;
 }
 
+QString IRCServer::channels() {
+    return m_channels;
+}
+
diff --git a/noncore/net/opieirc/ircserver.h b/noncore/net/opieirc/ircserver.h
index f56f231..0bc7d4c 100644
--- a/noncore/net/opieirc/ircserver.h
+++ b/noncore/net/opieirc/ircserver.h
@@ -25,34 +25,40 @@
 
 /* IRCServer stores all information required to
    establish a connection to a server. */
 
 class IRCServer {
 public:
+    /* Initialize to the default values */
     IRCServer();
 
+    /* Setters */
     void setName(QString name);
     void setHostname(QString hostname);
     void setPort(int port);
     void setUsername(QString username);
     void setPassword(QString password);
     void setNick(QString nick);
     void setRealname(QString realname);
+    void setChannels(QString channels);
 
+    /* Getters */
     QString hostname();
     QString name();
     unsigned short int port();
     QString username();
     QString password();
     QString nick();
     QString realname();
+    QString channels();
 protected:
     QString             m_hostname;
     QString             m_name;
     unsigned short int  m_port;
     QString             m_username;
     QString             m_password;
     QString             m_nick;
     QString             m_realname;
+    QString             m_channels;
 };
 
 #endif /* __IRCSERVER_H */
diff --git a/noncore/net/opieirc/ircservereditor.cpp b/noncore/net/opieirc/ircservereditor.cpp
index 798081f..c3a444d 100644
--- a/noncore/net/opieirc/ircservereditor.cpp
+++ b/noncore/net/opieirc/ircservereditor.cpp
@@ -1,13 +1,13 @@
 #include <qmessagebox.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include "ircservereditor.h"
 
 IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal = FALSE, WFlags f) : QDialog(parent, name, modal, f) {
-    QGridLayout *layout = new QGridLayout(this, 6, 2, 5, 5);
+    QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 5);
     QLabel *label = new QLabel(tr("Profile name :"), this);
     m_name = new QLineEdit(server.name(), this);
     layout->addWidget(label, 0, 0);
     layout->addWidget(m_name, 0, 1);
     label = new QLabel(tr("Hostname :"), this);
     m_hostname = new QLineEdit(server.hostname(), this);
@@ -26,12 +26,16 @@ IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char*
     layout->addWidget(label, 4, 0);
     layout->addWidget(m_realname, 4, 1);
     label = new QLabel(tr("Password :"), this);
     m_password = new QLineEdit(server.password(), this);
     layout->addWidget(label, 5, 0);
     layout->addWidget(m_password, 5, 1);
+    label = new QLabel(tr("Channels :"), this);
+    m_channels = new QLineEdit(server.channels(), this);
+    layout->addWidget(label, 6, 0);
+    layout->addWidget(m_channels, 6, 1);
     showMaximized();
 }
 
 
 void IRCServerEditor::accept() {
     if (m_name->text().length()==0)
@@ -41,21 +45,32 @@ void IRCServerEditor::accept() {
     else if (m_port->text().toInt()<=0)
         QMessageBox::critical(this, tr("Error"), tr("Port required"));
     else if (m_nickname->text().length()==0)
         QMessageBox::critical(this, tr("Error"), tr("Nickname required"));
     else if (m_realname->text().length()==0)
         QMessageBox::critical(this, tr("Error"), tr("Realname required"));
-    else
+    else {
+        /* Now verify whether the channel list has a valid format */
+        QStringList channels = QStringList::split(QChar(','), m_channels->text());
+        for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) {
+            QString channelName = (*it).stripWhiteSpace();
+            if (!channelName.startsWith("#")) {
+                QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma separated list of channel\n names which start with '#'"));
+                return;
+            }
+        }
         QDialog::accept();
 }
+}
 
 IRCServer IRCServerEditor::getServer() {
     IRCServer server;
     server.setName(m_name->text());
     server.setHostname(m_hostname->text());
     server.setPort(m_port->text().toInt());
     server.setNick(m_nickname->text());
     server.setRealname(m_realname->text());
     server.setUsername(m_nickname->text());
     server.setPassword(m_password->text());
+    server.setChannels(m_channels->text());
     return server;
 }
diff --git a/noncore/net/opieirc/ircservereditor.h b/noncore/net/opieirc/ircservereditor.h
index 20c94f7..22311f7 100644
--- a/noncore/net/opieirc/ircservereditor.h
+++ b/noncore/net/opieirc/ircservereditor.h
@@ -36,9 +36,10 @@ protected:
     QLineEdit *m_name;
     QLineEdit *m_hostname;
     QLineEdit *m_port;
     QLineEdit *m_nickname;
     QLineEdit *m_password;
     QLineEdit *m_realname;
+    QLineEdit *m_channels;
 };
 
 #endif /* __IRCSERVEREDITOR_H */
diff --git a/noncore/net/opieirc/ircserverlist.cpp b/noncore/net/opieirc/ircserverlist.cpp
index b2d746a..e664ba1 100644
--- a/noncore/net/opieirc/ircserverlist.cpp
+++ b/noncore/net/opieirc/ircserverlist.cpp
@@ -56,12 +56,13 @@ IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFla
                 server.setHostname(m_config->readEntry("Hostname"));
                 server.setPort(m_config->readNumEntry("Port"));
                 server.setUsername(m_config->readEntry("Username"));
                 server.setPassword(m_config->readEntry("Password"));
                 server.setNick(m_config->readEntry("Nick"));
                 server.setRealname(m_config->readEntry("Realname"));
+                server.setChannels(m_config->readEntry("Channels"));
                 m_list->insertItem(new IRCListBoxServer(server));
             }
         }
     }
     
     showMaximized();
@@ -111,12 +112,13 @@ int IRCServerList::exec() {
         m_config->writeEntry("Hostname", server.hostname());
         m_config->writeEntry("Port", QString::number(server.port()));
         m_config->writeEntry("Username", server.username());
         m_config->writeEntry("Password", server.password());
         m_config->writeEntry("Nick", server.nick());
         m_config->writeEntry("Realname", server.realname());
+        m_config->writeEntry("Channels", server.channels());
     }
     return returncode;
 }
 
 bool IRCServerList::hasServer() {
     return (m_list->currentItem() != -1);
diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp
index 724f4bd..2ad56a8 100644
--- a/noncore/net/opieirc/ircservertab.cpp
+++ b/noncore/net/opieirc/ircservertab.cpp
@@ -1,7 +1,8 @@
 #include <stdio.h>
+#include <qtextstream.h>
 #include "ircservertab.h"
 
 IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) {
     m_server = server;
     m_session = new IRCSession(&m_server);
     m_mainWindow = mainWindow;
@@ -22,16 +23,12 @@ void IRCServerTab::appendText(QString text) {
     /* not using append because it creates layout problems */
     m_textview->setText(m_textview->text() + text);
     m_textview->ensureVisible(0, m_textview->contentsHeight());
 }
 
 IRCServerTab::~IRCServerTab() {
-    QListIterator<IRCChannelTab> it(m_channelTabs);
-    for (; it.current(); ++it) {
-        m_mainWindow->killTab(it.current());
-    }
     delete m_session;
 }
 
 void IRCServerTab::removeChannelTab(IRCChannelTab *tab) {
     m_channelTabs.remove(tab);
 }
@@ -45,26 +42,56 @@ IRCSession *IRCServerTab::session() {
 }
 
 IRCServer *IRCServerTab::server() {
     return &m_server;
 }
 
+void IRCServerTab::executeCommand(IRCTab *tab, QString line) {
+    QTextIStream stream(&line);
+    QString command;
+    stream >> command;
+    command = command.upper().right(command.length()-1);
+    
+    if (command == "JOIN") {
+        QString channel;
+        stream >> channel;
+        if (channel.length() > 0 && channel.startsWith("#")) {
+            m_session->join(channel);
+        } else {
+            tab->appendText("<font color=\"#ff0000\">Unknown channel format!</font><br>"); 
+        }
+    } else {
+        tab->appendText("<font color=\"#ff0000\">Unknown command</font><br>"); 
+    }
+}
+
 void IRCServerTab::processCommand() {
+    QString text = m_field->text();
+    if (text.startsWith("/") && !text.startsWith("//")) {
+        /* Command mode */
+        executeCommand(this, text);
+    }
     m_field->clear();
-    appendText("<font color=\"#ff0000\">Not supported yet</font><br>"); 
 }
 
 void IRCServerTab::doConnect() {
     m_session->beginSession();
 }
 
 void IRCServerTab::remove() {
+    /* Close requested */
     if (m_session->isSessionActive()) {
+        /* While there is a running session */
         m_close = TRUE;
         m_session->endSession();
     } else {
+        /* Session has previously been closed */
+        m_channelTabs.first();
+        while (m_channelTabs.current() != 0) {
+            m_mainWindow->killTab(m_channelTabs.current());
+        }
         m_mainWindow->killTab(this);
     }
 }
 
 IRCChannelTab *IRCServerTab::getTabForChannel(IRCChannel *channel) {
     QListIterator<IRCChannelTab> it(m_channelTabs);
@@ -74,73 +101,84 @@ IRCChannelTab *IRCServerTab::getTabForChannel(IRCChannel *channel) {
             return it.current();
     }
     return 0;
 }
 
 void IRCServerTab::display(IRCOutput output) {
+
+    /* All messages to be displayed inside the GUI get here */
     switch (output.type()) {
         case OUTPUT_CONNCLOSE:
-            if (m_close)
+            if (m_close) {
+                m_channelTabs.first();
+                while (m_channelTabs.current() != 0) {
+                    m_mainWindow->killTab(m_channelTabs.current());
+                }
                 m_mainWindow->killTab(this);
-            else
-                appendText("<font color=\"#0000dd\">" + output.message() +"</font><br>");
+            } else {
+                appendText("<font color=\"#0000dd\">" + output.htmlMessage() +"</font><br>");
+                QListIterator<IRCChannelTab> it(m_channelTabs);
+                for (; it.current(); ++it) {
+                    it.current()->appendText("<font color=\"#0000dd\">" + output.htmlMessage() +"</font><br>");
+                }
+            }
             break;
         case OUTPUT_SELFJOIN: {
                 IRCChannelTab *channeltab = new IRCChannelTab((IRCChannel *)output.getParam(0), this, m_mainWindow, (QWidget *)parent());
                 m_channelTabs.append(channeltab);
                 m_mainWindow->addTab(channeltab);
             }
             break;
         case OUTPUT_CHANPRIVMSG: {
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
-                channelTab->appendText("&lt;<font color=\"#0000dd\">"+((IRCChannelPerson *)output.getParam(1))->person->nick()+"</font>&gt; "+output.message()+"<br>");
+                channelTab->appendText("&lt;<font color=\"#0000dd\">"+((IRCChannelPerson *)output.getParam(1))->person->nick()+"</font>&gt; "+output.htmlMessage()+"<br>");
             }
             break;
         case OUTPUT_SELFPART: {
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
                 if (channelTab)
                     m_mainWindow->killTab(channelTab);
             }
             break;
         case OUTPUT_SELFKICK: {
-                appendText("<font color=\"#ff0000\">" + output.message() + "</font><br>");
+                appendText("<font color=\"#ff0000\">" + output.htmlMessage() + "</font><br>");
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
                 if (channelTab)
                     m_mainWindow->killTab(channelTab);
             }
             break;
         case OUTPUT_CHANACTION: {
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
-                channelTab->appendText("<font color=\"#cc0000\">"+output.message()+"</font><br>");
+                channelTab->appendText("<font color=\"#cc0000\">"+output.htmlMessage()+"</font><br>");
             }
             break;
         case OUTPUT_QUIT: {
                 QString nick = ((IRCPerson *)output.getParam(0))->nick();
                 QListIterator<IRCChannelTab> it(m_channelTabs);
                 for (; it.current(); ++it) {
                     if (it.current()->list()->hasPerson(nick)) {
-                        it.current()->appendText("<font color=\"#aa3e00\">"+output.message()+"</font><br>");
+                        it.current()->appendText("<font color=\"#aa3e00\">"+output.htmlMessage()+"</font><br>");
                         it.current()->list()->update();
                     }
                 }
             }
             break;
         case OUTPUT_OTHERJOIN:
         case OUTPUT_OTHERKICK:
         case OUTPUT_CHANPERSONMODE:
         case OUTPUT_OTHERPART: {
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
-                channelTab->appendText("<font color=\"#aa3e00\">"+output.message()+"</font><br>");
+                channelTab->appendText("<font color=\"#aa3e00\">"+output.htmlMessage()+"</font><br>");
                 channelTab->list()->update();
             }
             break;
         case OUTPUT_CTCP:
-            appendText("<font color=\"#00bb00\">" + output.message() + "</font><br>");
+            appendText("<font color=\"#00bb00\">" + output.htmlMessage() + "</font><br>");
             break;
         case OUTPUT_ERROR:
-            appendText("<font color=\"#ff0000\">" + output.message() + "</font><br>");
+            appendText("<font color=\"#ff0000\">" + output.htmlMessage() + "</font><br>");
             break;
         default:
-            appendText("<font color=\"#0000dd\">" + output.message() + "</font><br>");
+            appendText("<font color=\"#0000dd\">" + output.htmlMessage() + "</font><br>");
             break;
     }
 }
diff --git a/noncore/net/opieirc/ircservertab.h b/noncore/net/opieirc/ircservertab.h
index fa9a0a3..cfa0832 100644
--- a/noncore/net/opieirc/ircservertab.h
+++ b/noncore/net/opieirc/ircservertab.h
@@ -36,12 +36,15 @@ public:
     IRCSession *session();
     IRCServer *server();
 
     /* Start the server session */
     void doConnect();
     void removeChannelTab(IRCChannelTab *tab);
+
+    /* Execute a user command such as /join */
+    void executeCommand(IRCTab *tab, QString line);
 protected:
     void appendText(QString text);
     IRCChannelTab *getTabForChannel(IRCChannel *channel);
 public slots:
     void remove();
     void processCommand();
diff --git a/noncore/net/opieirc/ircsession.cpp b/noncore/net/opieirc/ircsession.cpp
index b81038f..89df68c 100644
--- a/noncore/net/opieirc/ircsession.cpp
+++ b/noncore/net/opieirc/ircsession.cpp
@@ -9,12 +9,16 @@ IRCSession::IRCSession(IRCServer *server) {
     connect(m_connection, SIGNAL(messageArrived(IRCMessage *)), this, SLOT(handleMessage(IRCMessage *)));
     connect(m_parser, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput)));
     connect(m_connection, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput)));
 }
 
 IRCSession::~IRCSession() {
+    /* We want this to get deleted automatically */
+    m_channels.setAutoDelete(TRUE);
+    m_people.setAutoDelete(TRUE);
+        
     delete m_parser;
     delete m_connection;
 }
 
 void IRCSession::beginSession() {
     m_connection->doConnect();
diff --git a/noncore/net/opieirc/irctab.h b/noncore/net/opieirc/irctab.h
index 3124980..0ce9777 100644
--- a/noncore/net/opieirc/irctab.h
+++ b/noncore/net/opieirc/irctab.h
@@ -34,12 +34,13 @@
 class IRCTab : public QWidget {
     Q_OBJECT
 public:
     IRCTab(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
     virtual QString title() = 0;
     virtual IRCSession *session() = 0;
+    virtual void appendText(QString text) = 0;
 public slots:
     virtual void remove() = 0;
 protected:
     QLabel      *m_description;
     QVBoxLayout *m_layout;
 };
diff --git a/noncore/net/opieirc/ircversion.h b/noncore/net/opieirc/ircversion.h
index 0ef0d2f..f8510e6 100644
--- a/noncore/net/opieirc/ircversion.h
+++ b/noncore/net/opieirc/ircversion.h
@@ -18,10 +18,10 @@
 
 */
 
 #ifndef __IRCVERSION_H
 #define __IRCVERSION_H
 
-#define APP_VERSION "OpieIRC 0.1"
+#define APP_VERSION "OpieIRC 0.2"
 #define APP_COPYSTR "(c) 2002 by Wenzel Jakob"
 
 #endif /* __IRCVERSION_H */