← Back to branch summary

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

« back to all changes in this revision

Viewing changes to protocols/jabber/jabberbasecontact.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/jabber/jabberbasecontact.cpp
206
206
                        metaContact()->addToGroup ( group );
207
207
                }
208
208
 
209
 
                //Set nick name from roster
210
 
                if ( ! item.name().isEmpty() )
211
 
                {
212
 
                        setProperty ( protocol()->propNickName, item.name() );
213
 
                }
 
209
                //Set custom name from roster
 
210
                setCustomName ( item.name() );
214
211
        }
215
212
 
216
213
        /*
460
457
        */
461
458
        if(inherits ( "JabberContact" ))
462
459
        {
463
 
                if ( !mRosterItem.name().isEmpty() )
464
 
                {
465
 
                        setProperty ( protocol()->propNickName, mRosterItem.name() );
466
 
                }
467
 
                else if ( !vCard.nickName().isEmpty () )
 
460
                if ( !vCard.nickName().isEmpty () )
468
461
                {
469
462
                        setProperty ( protocol()->propNickName, vCard.nickName () );
470
463
                }