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

Let SipHandler set the avatar for MyCollection

Browse Source
This commit is contained in:
Dominik Schmidt
2011-04-21 13:42:16 +02:00
parent 3182a294d7
commit 3e20fd1f6a
6 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/sip/SipHandler.cpp
View File

@@ -179,6 +179,7 @@ SipHandler::loadPlugin( const QString& path )
QObject::connect( sip, SIGNAL( error( int, QString ) ), SLOT( onError( int, QString ) ) ); QObject::connect( sip, SIGNAL( error( int, QString ) ), SLOT( onError( int, QString ) ) );
QObject::connect( sip, SIGNAL( avatarReceived( QString, QPixmap ) ), SLOT( onAvatarReceived( QString, QPixmap ) ) ); QObject::connect( sip, SIGNAL( avatarReceived( QString, QPixmap ) ), SLOT( onAvatarReceived( QString, QPixmap ) ) );
QObject::connect( sip, SIGNAL( avatarReceived( QPixmap ) ), SLOT( onAvatarReceived( QPixmap ) ) );
m_plugins << sip; m_plugins << sip;
} }
} }
@@ -411,3 +412,9 @@ void SipHandler::onAvatarReceived( const QString& from, const QPixmap& avatar )
qDebug() << Q_FUNC_INFO << from << "no control connection setup yet"; qDebug() << Q_FUNC_INFO << from << "no control connection setup yet";
} }
} }
void SipHandler::onAvatarReceived( const QPixmap& avatar )
{
qDebug() << Q_FUNC_INFO << "Set own avatar on MyCollection";
SourceList::instance()->getLocal()->setAvatar( avatar );
}

7
src/libtomahawk/sip/SipHandler.h
View File

@@ -63,7 +63,12 @@ private slots:
void onSettingsChanged(); void onSettingsChanged();
void onAvatarReceived( const QString& from, const QPixmap& avatar = QPixmap()); // set data for local source
void onAvatarReceived( const QPixmap& avatar );
// set data for other sources
void onAvatarReceived( const QString& from, const QPixmap& avatar );
private: private:
static SipHandler *s_instance; static SipHandler *s_instance;

5
src/libtomahawk/sip/SipPlugin.h
View File

@@ -58,8 +58,13 @@ signals:
void peerOffline( const QString& ); void peerOffline( const QString& );
void msgReceived( const QString& from, const QString& msg ); void msgReceived( const QString& from, const QString& msg );
// new data for own source
void avatarReceived ( const QPixmap& avatar );
// new data for other sources;
void avatarReceived ( const QString& from, const QPixmap& avatar); void avatarReceived ( const QString& from, const QPixmap& avatar);
void addMenu( QMenu* menu ); void addMenu( QMenu* menu );
void removeMenu( QMenu* menu ); void removeMenu( QMenu* menu );
}; };

1
src/sip/jreen/jabber.cpp
View File

@@ -111,6 +111,7 @@ JabberPlugin::connectPlugin( bool startup )
QObject::connect( p, SIGNAL( authError( int, QString ) ), SLOT( onAuthError( int, QString ) ) ); QObject::connect( p, SIGNAL( authError( int, QString ) ), SLOT( onAuthError( int, QString ) ) );
QObject::connect( p, SIGNAL( avatarReceived( QString, QPixmap ) ), SIGNAL( avatarReceived( QString, QPixmap ) ) ); QObject::connect( p, SIGNAL( avatarReceived( QString, QPixmap ) ), SIGNAL( avatarReceived( QString, QPixmap ) ) );
QObject::connect( p, SIGNAL( avatarReceived( QPixmap ) ), SIGNAL( avatarReceived( QPixmap) ) );
return true; return true;
} }

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

@@ -553,5 +553,10 @@ void Jabber_p::onNewAvatar(const QString& jid)
} }
} }
emit avatarReceived ( jid, m_avatarManager->avatar( jid ) ); if( jid == m_client->jid().bare() )
// own avatar
emit avatarReceived ( m_avatarManager->avatar( jid ) );
else
// someone else's avatar
emit avatarReceived ( jid, m_avatarManager->avatar( jid ) );
} }

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

@@ -65,6 +65,7 @@ signals:
void connected(); void connected();
void disconnected(); void disconnected();
void jidChanged( const QString& ); void jidChanged( const QString& );
void avatarReceived( const QPixmap& avatar );
void avatarReceived( const QString&, const QPixmap& avatar ); void avatarReceived( const QString&, const QPixmap& avatar );
void authError( int, const QString& ); void authError( int, const QString& );