1 files changed, 4 insertions, 1 deletions

diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp
index 707e17f..881ded7 100644
--- a/noncore/net/opieirc/ircchanneltab.cpp
+++ b/noncore/net/opieirc/ircchanneltab.cpp
@@ -95,126 +95,129 @@ void IRCChannelTab::appendText(QString text) {
         emit ping( title() );
     else if ( (p1 = text.find("ping", 0, false) )!= -1 && (p2 = text.find( m_parentTab->server()->nick(), 0,false )) != -1  ) {
         int col = text.findRev("color", -1, false);
         if ( col < p2 )
             emit ping( title() );
 
     }
 
     emit changed(this);
 }
 
 IRCChannelTab::~IRCChannelTab() {
     m_parentTab->removeChannelTab(this);
 }
 
 void IRCChannelTab::processCommand() {
     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 (text.startsWith("//"))
                     text = text.right(text.length()-1);
                 session()->sendMessage(m_channel, m_field->text());
                 appendText("<font color=\"" + m_textColor + "\">&lt;</font><font color=\"" + m_selfColor + "\">"+m_parentTab->server()->nick()+"</font><font color=\"" + m_textColor + "\">&gt; "+IRCOutput::toHTML(m_field->text())+"</font><br>");
             }
         } else {
             appendText("<font color=\"" + m_errorColor + "\">"+tr("Disconnected")+"</font><br>");
         }
     }
     m_field->clear();
 }
 
 void IRCChannelTab::settingsChanged() {
     m_textview->setText("<qt bgcolor=\"" + m_backgroundColor + "\"/>");
     m_lines = 0;
 }
 
 void IRCChannelTab::toggleList() {
     if (m_listVisible) {
         m_list->setMaximumWidth(0);
         m_listButton->setText("<");
     } else {
         m_list->setMaximumWidth(LISTWIDTH);
         m_listButton->setText(">");
     }
     m_listVisible = !m_listVisible;
 }
 
 void IRCChannelTab::mouseButtonPressed(int mouse, QListBoxItem *, const QPoint &point) {
     switch (mouse) {
         case 1:
             break;
         case 2:
             m_popup->popup(point);
             break;
     };
 }
 
 void IRCChannelTab::popupQuery( QListBoxItem *item) {
     if (item) {
         IRCPerson *person = session()->getPerson(item->text());
         if (person) {
             IRCQueryTab *tab = m_parentTab->getTabForQuery(person);
             if (!tab) {
                 tab = new IRCQueryTab(person, m_parentTab, m_mainWindow, (QWidget *)parent());
                 m_parentTab->addQueryTab(tab);
                 m_mainWindow->addTab(tab);
             }
         }
     }
 }
 
 void IRCChannelTab::popupQuery() {
     if ( m_list->currentItem() != -1 )
         popupQuery( m_list->item(m_list->currentItem()));
 }
 
 void IRCChannelTab::popupPing() {
     if(m_list->currentItem() != -1)
         m_parentTab->session()->sendCTCPPing(m_list->text(m_list->currentItem()));
 }
 
 void IRCChannelTab::popupVersion() {
     if(m_list->currentItem() != -1)
         m_parentTab->session()->sendCTCPRequest(m_list->text(m_list->currentItem()), "VERSION", "");
 }
 
 void IRCChannelTab::popupWhois() {
     if(m_list->currentItem() != -1)
         m_parentTab->session()->whois(m_list->text(m_list->currentItem()));
 }
 
 QString IRCChannelTab::title() {
-    return m_channel->channelname();
+    if(!m_channel->channelname().startsWith("&"))
+        return m_channel->channelname();
+
+    return "&" + m_channel->channelname();
 }
 
 IRCSession *IRCChannelTab::session() {
     return m_parentTab->session();
 }
 
 void IRCChannelTab::remove() {
     if (session()->isSessionActive()) {
         session()->part(m_channel);
     } else {
         m_mainWindow->killTab(this);
     }
 }
 
 void IRCChannelTab::enqueue(const QString &channel, const QString &message) {
     if (m_queuedMessages.count() == (m_queuedMessages.size() - 1) )
         /* 17 messages max */
         return;
     m_queuedMessages.insert(channel, new QString(message));
 }
 
 IRCChannel *IRCChannelTab::channel() {
     return m_channel;
 }
 
 IRCChannelList *IRCChannelTab::list() {
     return m_list;
 }