From 89e21289a63f8f6153c014d011a10d405c00d1ce Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 12 Jul 2012 10:08:52 +0200 Subject: [PATCH] * Fixed broken merge. --- src/libtomahawk/sip/SipHandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/sip/SipHandler.cpp b/src/libtomahawk/sip/SipHandler.cpp index 21d94c331..7b950753f 100644 --- a/src/libtomahawk/sip/SipHandler.cpp +++ b/src/libtomahawk/sip/SipHandler.cpp @@ -118,10 +118,10 @@ SipHandler::hookUpPlugin( SipPlugin* sip ) void -SipHandler::onPeerOnline( const QString& jid ) +SipHandler::onPeerOnline( const QString& peerId ) { // qDebug() << Q_FUNC_INFO; - tDebug() << "SIP online:" << jid; + tDebug() << "SIP online:" << peerId; SipPlugin* sip = qobject_cast(sender()); @@ -132,7 +132,7 @@ SipHandler::onPeerOnline( const QString& jid ) ControlConnection* conn = new ControlConnection( Servent::instance(), QString() ); const QString& nodeid = Database::instance()->impl()->dbid(); - conn->setName( jid.left( jid.indexOf( "/" ) ) ); + conn->setName( peerId.left( peerId.indexOf( "/" ) ) ); conn->setId( nodeid ); Servent::instance()->registerOffer( key, conn ); @@ -155,10 +155,10 @@ SipHandler::onPeerOnline( const QString& jid ) void -SipHandler::onPeerOffline( const QString& jid ) +SipHandler::onPeerOffline( const QString& peerId ) { // qDebug() << Q_FUNC_INFO; - qDebug() << "SIP offline:" << jid; + qDebug() << "SIP offline:" << peerId; }