From e1cfcce4891283b60df68e0445e2b8455ff1a5b3 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 28 Feb 2011 02:11:16 +0100
Subject: [PATCH] Register presence handler in libsip_jabber

---
 src/sip/jabber/jabber_p.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sip/jabber/jabber_p.cpp b/src/sip/jabber/jabber_p.cpp
index 8873e7e66..7411a0550 100644
--- a/src/sip/jabber/jabber_p.cpp
+++ b/src/sip/jabber/jabber_p.cpp
@@ -122,6 +122,8 @@ Jabber_p::go()
         qDebug() << "No server found!";
         return;
     }
+
+    m_client->registerPresenceHandler( this );
     m_client->registerConnectionListener( this );
     m_client->logInstance().registerLogHandler( LogLevelWarning, LogAreaAll, this );
     m_client->registerMessageHandler( this );
@@ -511,8 +513,11 @@ Jabber_p::handlePresence( const gloox::Presence& presence )
 
     // ignore anyone not running tomahawk:
     // convert to QString to get proper regex support
+    QString node;
     const gloox::Capabilities *caps = presence.findExtension<gloox::Capabilities>( gloox::ExtCaps );
-    QString node = QString::fromAscii( caps->node().c_str() );
+    if( caps )
+        QString node = QString::fromAscii( caps->node().c_str() );
+
     if( !QString::fromAscii( jid.resource().c_str() ).startsWith( QLatin1String( "tomahawk" ) )
         && !( node == TOMAHAWK_CAP_NODE_NAME ) )
     {