[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Volker Härtel <cyberbeat () gmx ! de>
Date:       2012-01-05 21:23:23
Message-ID: 20120105212323.E50B0AC890 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1271910 by vhaertel:

Do not allow jabber protocol to rename meta-contacts automatically, when
nickname-source is another


 M  +0 -14     jabberbasecontact.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberbasecontact.cpp \
#1271909:1271910 @@ -106,20 +106,6 @@
 	 */
 	setDontSync ( true );
 
-	// The myself contact is not in the roster on server, ignore this code
-	// because the myself MetaContact displayname become the latest 
-	// Jabber acccount jid.
-	if( metaContact() != Kopete::ContactList::self()->myself() )
-	{
-		// only update the alias if it is not empty
-		if ( !item.name().isEmpty () && item.name() != item.jid().bare() 
-			&& metaContact()->customDisplayName() != item.name () )
-		{
-			kDebug ( JABBER_DEBUG_GLOBAL ) << "setting display name of " << contactId () << " \
                to " << item.name();
-			metaContact()->setDisplayName ( item.name () );
-		}
-	}
-
 	/*
 	 * Set the contact's subscription status
 	 */


[prev in list] [next in list] [prev in thread] [next in thread]