From 6b7e0e8180fbd2948890383dbf31a74341ea8edd Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Wed, 30 Jan 2013 20:05:45 +0100
Subject: [PATCH] Show nicknames from roster instead of xmpp ids

---
 src/accounts/xmpp/sip/XmppSip.cpp | 19 +++++++++++++++++++
 src/accounts/xmpp/sip/XmppSip.h   |  1 +
 src/libtomahawk/Source.cpp        |  9 +++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp
index 0525625e1..d3d89aa48 100644
--- a/src/accounts/xmpp/sip/XmppSip.cpp
+++ b/src/accounts/xmpp/sip/XmppSip.cpp
@@ -725,6 +725,24 @@ XmppSipPlugin::onPresenceReceived( const Jreen::RosterItem::Ptr& item, const Jre
         return;
     }
 
+    // cache name
+    if( !item.isNull() && item->name() != jid.bare() && m_jidsNames.value( jid.bare() ) != item->name() )
+    {
+        tLog() << "cache name" << item->name() << "for" << jid.bare() << item << presence.subtype();
+        m_jidsNames.insert( jid.bare(), item->name() );
+
+        // find peers for the jid and update their friendlyName
+        foreach ( const Jreen::JID& peer, m_peers.keys() )
+        {
+            if ( peer.bare() == jid.bare() )
+            {
+                Tomahawk::peerinfo_ptr peerInfo = PeerInfo::get( this, peer.full() );
+                if( !peerInfo.isNull() )
+                    peerInfo->setFriendlyName( item->name() );
+            }
+        }
+    }
+
     // ignore anyone not Running tomahawk:
     Jreen::Capabilities::Ptr caps = presence.payload<Jreen::Capabilities>();
     if ( caps )
@@ -976,6 +994,7 @@ XmppSipPlugin::handlePeerStatus( const Jreen::JID& jid, Jreen::Presence::Type pr
         Tomahawk::peerinfo_ptr peerInfo = PeerInfo::get( this, fulljid, PeerInfo::AutoCreate );
         peerInfo->setContactId( jid.bare() );
         peerInfo->setStatus( PeerInfo::Online );
+        peerInfo->setFriendlyName( m_jidsNames.value( jid.bare() ) );
 
 #ifndef ENABLE_HEADLESS
         if ( !m_avatarManager->avatar( jid.bare() ).isNull() )
diff --git a/src/accounts/xmpp/sip/XmppSip.h b/src/accounts/xmpp/sip/XmppSip.h
index 36096fb3f..fabcbf438 100644
--- a/src/accounts/xmpp/sip/XmppSip.h
+++ b/src/accounts/xmpp/sip/XmppSip.h
@@ -142,6 +142,7 @@ private:
     Jreen::MUCRoom* m_room;
     Jreen::SimpleRoster* m_roster;
     QHash< Jreen::JID, Jreen::Presence::Type > m_peers;
+    QHash< QString, QString > m_jidsNames;
 
 #ifndef ENABLE_HEADLESS
     QHash< Jreen::JID, QMessageBox* > m_subscriptionConfirmBoxes;
diff --git a/src/libtomahawk/Source.cpp b/src/libtomahawk/Source.cpp
index f5f2fc708..a98d1c5be 100644
--- a/src/libtomahawk/Source.cpp
+++ b/src/libtomahawk/Source.cpp
@@ -130,6 +130,15 @@ Source::nodeId() const
 QString
 Source::friendlyName() const
 {
+    QPixmap result;
+    foreach( const peerinfo_ptr& peerInfo, peerInfos() )
+    {
+        if( !peerInfo.isNull() && !peerInfo->friendlyName().isEmpty() )
+        {
+            return peerInfo->friendlyName();
+        }
+    }
+
     if ( m_friendlyname.isEmpty() )
         return dbFriendlyName();