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

List:       kopete-devel
Subject:    [kopete-devel] [Bug 124940] [liboscar] use new aliases from the
From:       Roman Jarosz <kedgedev () centrum ! cz>
Date:       2006-07-28 13:23:18
Message-ID: 20060728132318.16415.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=124940         
kedgedev centrum cz changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From kedgedev centrum cz  2006-07-28 15:23 -------
SVN commit 567276 by rjarosz:

Fix Bug 124940: [liboscar] use new aliases from the server
First use alias if a user doesn't have alias than use nickname from user info.

BUG: 124940



 M  +3 -3      icq/icqcontact.cpp  
 M  +4 -0      oscarcontact.cpp  


--- branches/kopete/0.12/kopete/protocols/oscar/icq/icqcontact.cpp #567275:567276
 @ -232,7 +232,7  @
 	if ( ( ( hasProperty( Kopete::Global::Properties::self()->nickName().key() )
 	         && nickName() == contactId() )
 	     || !hasProperty( Kopete::Global::Properties::self()->nickName().key() ) ) &&
-	     !m_requestingNickname )
+	     !m_requestingNickname && m_ssiItem.alias().isEmpty() )
 	{
 		m_requestingNickname = true;
 		int time = ( KApplication::random() % 20 ) * 1000;
 @ -328,7 +328,7  @
 	kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "received long info from engine" << endl;
 
 	ICQGeneralUserInfo genInfo = mAccount->engine()->getGeneralInfo( contact );
-	if ( !genInfo.nickname.isEmpty() )
+	if ( m_ssiItem.alias().isEmpty() && !genInfo.nickname.isEmpty() )
 		setNickName( codec->toUnicode( genInfo.nickname ) );
 	emit haveBasicInfo( genInfo );
 
 @ -363,7 +363,7  @
 	else
 		removeProperty(mProtocol->lastName);
 	*/
-	if ( !shortInfo.nickname.isEmpty() )
+	if ( m_ssiItem.alias().isEmpty() && !shortInfo.nickname.isEmpty() )
 	{
 		kdDebug(14153) << k_funcinfo <<
 			"setting new displayname for former UIN-only Contact" << endl;
--- branches/kopete/0.12/kopete/protocols/oscar/oscarcontact.cpp #567275:567276
 @ -80,6 +80,10  @
 void OscarContact::setSSIItem( const Oscar::SSI& ssiItem )
 {
 	m_ssiItem = ssiItem;
+
+	if ( !m_ssiItem.alias().isEmpty() )
+		setProperty( Kopete::Global::Properties::self()->nickName(), m_ssiItem.alias() );
+
 	emit updatedSSI();
 }
_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel
[prev in list] [next in list] [prev in thread] [next in thread]