← Back to branch summary

~ubuntu-branches/debian/experimental/kopete/experimental

« back to all changes in this revision

Viewing changes to protocols/oscar/oscarprivacyengine.cpp

  • Committer: Package Import Robot
  • Author(s): Maximiliano Curia
  • Date: 2015-02-24 11:32:57 UTC
  • mfrom: (1.1.41 vivid)
  • Revision ID: package-import@ubuntu.com-20150224113257-gnupg4v7lzz18ij0
Tags: 4:14.12.2-1
* New upstream release (14.12.2).
* Bump Standards-Version to 3.9.6, no changes needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/oscar/oscarprivacyengine.cpp
42
42
                
43
43
                OscarContact* oc = dynamic_cast<OscarContact*>( account->contacts().value( ( *it ).name() ) );
44
44
                if ( oc )
45
 
                {       //for better orientation in lists use nickName and id
 
45
                {       //for better orientation in lists use displayName and id
46
46
                        QString screenName( "%1 (%2)" );
47
 
                        screenName = screenName.arg( oc->nickName(), contactId );
 
47
                        screenName = screenName.arg( oc->displayName(), contactId );
48
48
                        contactMap.insert( contactId, screenName );
49
49
                }
50
50
                else