mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 07:07:05 +02:00
Code Issues Releases Wiki Activity

* Fixed broken merge.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-07-12 10:08:52 +02:00
parent fe0d2d87fc
commit 89e21289a6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/sip/SipHandler.cpp
View File

@@ -118,10 +118,10 @@ SipHandler::hookUpPlugin( SipPlugin* sip )
void void
SipHandler::onPeerOnline( const QString& jid ) SipHandler::onPeerOnline( const QString& peerId )
{ {
// qDebug() << Q_FUNC_INFO; // qDebug() << Q_FUNC_INFO;
tDebug() << "SIP online:" << jid; tDebug() << "SIP online:" << peerId;
SipPlugin* sip = qobject_cast<SipPlugin*>(sender()); SipPlugin* sip = qobject_cast<SipPlugin*>(sender());
@@ -132,7 +132,7 @@ SipHandler::onPeerOnline( const QString& jid )
ControlConnection* conn = new ControlConnection( Servent::instance(), QString() ); ControlConnection* conn = new ControlConnection( Servent::instance(), QString() );
const QString& nodeid = Database::instance()->impl()->dbid(); const QString& nodeid = Database::instance()->impl()->dbid();
conn->setName( jid.left( jid.indexOf( "/" ) ) ); conn->setName( peerId.left( peerId.indexOf( "/" ) ) );
conn->setId( nodeid ); conn->setId( nodeid );
Servent::instance()->registerOffer( key, conn ); Servent::instance()->registerOffer( key, conn );
@@ -155,10 +155,10 @@ SipHandler::onPeerOnline( const QString& jid )
void void
SipHandler::onPeerOffline( const QString& jid ) SipHandler::onPeerOffline( const QString& peerId )
{ {
// qDebug() << Q_FUNC_INFO; // qDebug() << Q_FUNC_INFO;
qDebug() << "SIP offline:" << jid; qDebug() << "SIP offline:" << peerId;
} }