[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenonbeta/kopete/protocols/irc
From: Jason Keirstead <jason () keirstead ! org>
Date: 2003-03-15 2:28:30
[Download RAW message or body]
CVS commit by brunes:
Return the channels full custom context collection
M +0 -2 ircaccount.cpp 1.14
M +1 -1 ircchannelcontact.cpp 1.42
M +1 -10 ircprotocol.cpp 1.85
M +0 -1 ircprotocol.h 1.46
--- kdenonbeta/kopete/protocols/irc/ircaccount.cpp #1.13:1.14
@@ -162,6 +162,4 @@ IRCChannelContact *IRCAccount::findChann
channel = new IRCChannelContact(this, name, m);
mChannels.insert( lowerName, channel );
- if( engine()->state() == QSocket::Connected)
- channel->setOnlineStatus( IRCProtocol::IRCChannelOnline() );
QObject::connect(channel, SIGNAL(contactDestroyed(KopeteContact *)), \
this, SLOT(slotContactDestroyed(KopeteContact *)));
--- kdenonbeta/kopete/protocols/irc/ircchannelcontact.cpp #1.41:1.42
@@ -173,5 +173,5 @@ void IRCChannelContact::slotJoin()
{
if ( !isConnected && onlineStatus().status() == KopeteOnlineStatus::Online )
- mEngine->joinChannel(mNickName);
+ execute();
}
--- kdenonbeta/kopete/protocols/irc/ircprotocol.cpp #1.84:1.85
@@ -133,17 +133,8 @@ KActionCollection *IRCProtocol::customCh
mActions = new KActionCollection(this);
if( e.className() == QString::fromLatin1("KopeteIRCChannel") )
- {
- new KAction(i18n("Join \
%1").arg(e.innerText().string()),0,this,SLOT(slotJoinChannel()),mActions);
- }
+ return activeAccount->findChannel( e.innerText().string() \
)->customContextMenuActions(); }
return mActions;
-}
-
-void IRCProtocol::slotJoinChannel()
-{
- DOM::HTMLElement e = activeNode;
- if( !e.isNull() )
- activeAccount->findChannel( e.innerText().string() )->startChat();
}
--- kdenonbeta/kopete/protocols/irc/ircprotocol.h #1.45:1.46
@@ -75,5 +75,4 @@ public:
private slots:
- void slotJoinChannel();
void slotMessageFilter( KopeteMessage &msg );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic