From kde-commits  Mon Jun 02 21:11:43 2008
From: Urs Wolfer <uwolfer () kde ! org>
Date: Mon, 02 Jun 2008 21:11:43 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/jabber
Message-Id: <1212441103.309280.17266.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121244111129939

SVN commit 815948 by uwolfer:

Fix for Google Talk contacts: Google Talk does not provide the Jabber nickname property. If nickname property is empty, take fullname as nickname (which will be shown in the contact list). Reviewed and okay'ed by mattr.

 M  +4 -0      jabberbasecontact.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberbasecontact.cpp #815947:815948
@@ -424,6 +424,10 @@
 		{
 			setProperty ( protocol()->propNickName, vCard.nickName () );
 		}
+		else if ( !vCard.fullName().isEmpty () ) // google talk contacts for example do not have a nickname; better show fullname instead of jabber id
+		{
+			setProperty ( protocol()->propNickName, vCard.fullName () );
+		}
 		else
 		{
 			removeProperty ( protocol()->propNickName );