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

* Fixed trying to call connect() on a null-pointer.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-02-28 02:07:14 +01:00
parent 328cd7eb6d
commit 8096d5c7e8
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libtomahawk/network/controlconnection.cpp
View File

@@ -131,11 +131,14 @@ ControlConnection::setupDbSyncConnection( bool ondemand )
sendMsg( m ); sendMsg( m );
} }
connect( m_dbsyncconn, SIGNAL( finished() ), if ( m_dbsyncconn )
m_dbsyncconn, SLOT( deleteLater() ) ); {
connect( m_dbsyncconn, SIGNAL( finished() ),
m_dbsyncconn, SLOT( deleteLater() ) );
connect( m_dbsyncconn, SIGNAL( destroyed( QObject* ) ), connect( m_dbsyncconn, SIGNAL( destroyed( QObject* ) ),
SLOT( dbSyncConnFinished( QObject* ) ), Qt::DirectConnection ); SLOT( dbSyncConnFinished( QObject* ) ), Qt::DirectConnection );
}
} }

14
src/sip/jabber/jabber_p.cpp
View File

@@ -501,9 +501,7 @@ Jabber_p::handleRosterError( const IQ& /*iq*/ )
void void
Jabber_p::handlePresence( const gloox::Presence& presence ) Jabber_p::handlePresence( const gloox::Presence& presence )
{ {
//JID jid( item.jid() );
JID jid = presence.from(); JID jid = presence.from();
//jid.setResource( resource );
QString fulljid( jid.full().c_str() ); QString fulljid( jid.full().c_str() );
qDebug() << "* handleRosterPresence" << fulljid << presence.subtype(); qDebug() << "* handleRosterPresence" << fulljid << presence.subtype();
@@ -535,9 +533,7 @@ Jabber_p::handlePresence( const gloox::Presence& presence )
// "going offline" event // "going offline" event
if ( !presenceMeansOnline( presence.subtype() ) && if ( !presenceMeansOnline( presence.subtype() ) &&
( !m_peers.contains( fulljid ) || ( !m_peers.contains( fulljid ) ||
presenceMeansOnline( m_peers.value( fulljid ) ) presenceMeansOnline( m_peers.value( fulljid ) ) ) )
)
)
{ {
m_peers[ fulljid ] = presence.subtype(); m_peers[ fulljid ] = presence.subtype();
qDebug() << "* Peer goes offline:" << fulljid; qDebug() << "* Peer goes offline:" << fulljid;
@@ -546,11 +542,9 @@ Jabber_p::handlePresence( const gloox::Presence& presence )
} }
// "coming online" event // "coming online" event
if( presenceMeansOnline( presence.subtype() ) && if ( presenceMeansOnline( presence.subtype() ) &&
( !m_peers.contains( fulljid ) || ( !m_peers.contains( fulljid ) ||
!presenceMeansOnline( m_peers.value( fulljid ) ) !presenceMeansOnline( m_peers.value( fulljid ) ) ) )
)
)
{ {
m_peers[ fulljid ] = presence.subtype(); m_peers[ fulljid ] = presence.subtype();
qDebug() << "* Peer goes online:" << fulljid; qDebug() << "* Peer goes online:" << fulljid;