← Back to branch summary

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

« back to all changes in this revision

Viewing changes to protocols/oscar/oscarcontact.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/oscarcontact.cpp
110
110
 
111
111
void OscarContact::setSSIItem( const OContact& ssiItem )
112
112
{
113
 
        if ( !ssiItem.alias().isEmpty() )
114
 
                setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() );
115
 
        
 
113
        setCustomName( ssiItem.alias() );
116
114
        m_ssiItem = ssiItem;
117
115
}
118
116
 
419
417
{
420
418
        QString info = i18n("The user %1 requires authorization before being added to a contact list. "
421
419
                            "Do you want to send an authorization request?\n\nReason for requesting authorization:",
422
 
                            ( !nickName().isEmpty() ) ? nickName() : contactId() );
 
420
                            displayName() );
423
421
 
424
422
        QString reason = KInputDialog::getText( i18n("Request Authorization"), info,
425
423
                                                i18n("Please authorize me so I can add you to my contact list") );