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

Fix crashes and bad accesses

Browse Source
This commit is contained in:
Jeff Mitchell
2011-04-22 13:02:01 -04:00
parent 4ffe635486
commit e3aa497b62
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sip/jreen/jabber_p.cpp
View File

@@ -25,6 +25,7 @@
#include "utils/tomahawkutils.h" #include "utils/tomahawkutils.h"
#include <jreen/capabilities.h> #include <jreen/capabilities.h>
#include <jreen/tcpconnection.h>
#include <jreen/vcardupdate.h> #include <jreen/vcardupdate.h>
#include <jreen/vcard.h> #include <jreen/vcard.h>
@@ -64,6 +65,8 @@ Jabber_p::Jabber_p( const QString& jid, const QString& password, const QString&
// general client setup // general client setup
m_client = new Jreen::Client( jid, password ); m_client = new Jreen::Client( jid, password );
m_client->setServer( server );
m_client->setPort( port );
m_client->registerStanzaExtension(new TomahawkSipMessageFactory); m_client->registerStanzaExtension(new TomahawkSipMessageFactory);
m_client->setResource( QString( "tomahawk%1" ).arg( QString::number( qrand() % 10000 ) ) ); m_client->setResource( QString( "tomahawk%1" ).arg( QString::number( qrand() % 10000 ) ) );
@@ -86,12 +89,14 @@ Jabber_p::Jabber_p( const QString& jid, const QString& password, const QString&
qDebug() << "Our JID set to:" << m_client->jid().full(); qDebug() << "Our JID set to:" << m_client->jid().full();
qDebug() << "Our Server set to:" << m_client->server(); qDebug() << "Our Server set to:" << m_client->server();
qDebug() << "Our Port set to" << m_client->port(); qDebug() << "Our Port set to" << m_client->port();
m_client->setConnectionImpl( new Jreen::TcpConnection( m_client->server(), m_client->port() ) );
// setup slots // setup slots
connect(m_client->connection(), SIGNAL(error(SocketError)), SLOT(onError(SocketError))); connect(qobject_cast<Jreen::Connection*>(m_client->connection()), SIGNAL(error(const Jreen::Connection::SocketError&)), SLOT(onError(const Jreen::Connection::SocketError&)));
connect(m_client, SIGNAL(serverFeaturesReceived(QSet<QString>)), SLOT(onConnect())); connect(m_client, SIGNAL(serverFeaturesReceived(QSet<QString>)), SLOT(onConnect()));
connect(m_client, SIGNAL(disconnected(Jreen::Client::DisconnectReason)), SLOT(onDisconnect(Jreen::Client::DisconnectReason))); connect(m_client, SIGNAL(disconnected(Jreen::Client::DisconnectReason)), SLOT(onDisconnect(Jreen::Client::DisconnectReason)));
connect(m_client, SIGNAL(destroyed(QObject*)), this, SLOT(onDestroy())); connect(m_client, SIGNAL(destroyed(QObject*)), this, SLOT(onDestroy(QObject*)));
connect(m_client, SIGNAL(newMessage(Jreen::Message)), SLOT(onNewMessage(Jreen::Message))); connect(m_client, SIGNAL(newMessage(Jreen::Message)), SLOT(onNewMessage(Jreen::Message)));
connect(m_client, SIGNAL(newPresence(Jreen::Presence)), SLOT(onNewPresence(Jreen::Presence))); connect(m_client, SIGNAL(newPresence(Jreen::Presence)), SLOT(onNewPresence(Jreen::Presence)));
connect(m_client, SIGNAL(newIQ(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ))); connect(m_client, SIGNAL(newIQ(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ)));

4
src/sip/jreen/jabber_p.h
View File

@@ -85,6 +85,10 @@ private slots:
{ {
qDebug() << e; qDebug() << e;
} }
virtual void onDestroy( QObject */*object*/ )
{
qDebug() << Q_FUNC_INFO;
}
virtual void onNewIq( const Jreen::IQ &iq, int context = NoContext ); virtual void onNewIq( const Jreen::IQ &iq, int context = NoContext );
virtual void onNewAvatar( const QString &jid ); virtual void onNewAvatar( const QString &jid );