From 8096d5c7e872ccebf6e5d90af4d9e7e8c70c1141 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 28 Feb 2011 02:07:14 +0100
Subject: [PATCH] * Fixed trying to call connect() on a null-pointer.

---
 src/libtomahawk/network/controlconnection.cpp | 11 +++++++----
 src/sip/jabber/jabber_p.cpp                   | 14 ++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/libtomahawk/network/controlconnection.cpp b/src/libtomahawk/network/controlconnection.cpp
index 67e807f67..bb5d46489 100644
--- a/src/libtomahawk/network/controlconnection.cpp
+++ b/src/libtomahawk/network/controlconnection.cpp
@@ -131,11 +131,14 @@ ControlConnection::setupDbSyncConnection( bool ondemand )
         sendMsg( m );
     }
 
-    connect( m_dbsyncconn, SIGNAL( finished() ),
-             m_dbsyncconn,   SLOT( deleteLater() ) );
+    if ( m_dbsyncconn )
+    {
+        connect( m_dbsyncconn, SIGNAL( finished() ),
+                m_dbsyncconn,   SLOT( deleteLater() ) );
 
-    connect( m_dbsyncconn, SIGNAL( destroyed( QObject* ) ),
-                             SLOT( dbSyncConnFinished( QObject* ) ), Qt::DirectConnection );
+        connect( m_dbsyncconn, SIGNAL( destroyed( QObject* ) ),
+                                SLOT( dbSyncConnFinished( QObject* ) ), Qt::DirectConnection );
+    }
 }
 
 
diff --git a/src/sip/jabber/jabber_p.cpp b/src/sip/jabber/jabber_p.cpp
index 9b8a3c6c9..8873e7e66 100644
--- a/src/sip/jabber/jabber_p.cpp
+++ b/src/sip/jabber/jabber_p.cpp
@@ -501,9 +501,7 @@ Jabber_p::handleRosterError( const IQ& /*iq*/ )
 void
 Jabber_p::handlePresence( const gloox::Presence& presence )
 {
-    //JID jid( item.jid() );
     JID jid = presence.from();
-    //jid.setResource( resource );
     QString fulljid( jid.full().c_str() );
 
     qDebug() << "* handleRosterPresence" << fulljid << presence.subtype();
@@ -535,9 +533,7 @@ Jabber_p::handlePresence( const gloox::Presence& presence )
     // "going offline" event
     if ( !presenceMeansOnline( presence.subtype() ) &&
          ( !m_peers.contains( fulljid ) ||
-           presenceMeansOnline( m_peers.value( fulljid ) )
-         )
-       )
+           presenceMeansOnline( m_peers.value( fulljid ) ) ) )
     {
         m_peers[ fulljid ] = presence.subtype();
         qDebug() << "* Peer goes offline:" << fulljid;
@@ -546,11 +542,9 @@ Jabber_p::handlePresence( const gloox::Presence& presence )
     }
 
     // "coming online" event
-    if( presenceMeansOnline( presence.subtype() ) &&
-        ( !m_peers.contains( fulljid ) ||
-          !presenceMeansOnline( m_peers.value( fulljid ) )
-        )
-       )
+    if ( presenceMeansOnline( presence.subtype() ) &&
+         ( !m_peers.contains( fulljid ) ||
+           !presenceMeansOnline( m_peers.value( fulljid ) ) ) )
     {
         m_peers[ fulljid ] = presence.subtype();
         qDebug() << "* Peer goes online:" << fulljid;