← Back to branch summary

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

« back to all changes in this revision

Viewing changes to protocols/wlm/wlmaccount.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/wlm/wlmaccount.cpp
242
242
    bool ok;
243
243
    const QString name = KInputDialog::getText( i18n( "Change Display Name - MSN Plugin" ), //TODO rename MSN to WLM (see also following strings)
244
244
        i18n( "Enter the new display name by which you want to be visible to your friends on MSN:" ),
245
 
        myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), &ok );
 
245
        myself()->displayName(), &ok );
246
246
 
247
247
    if ( ok )
248
248
    {
553
553
WlmAccount::gotDisplayName (const QString & displayName)
554
554
{
555
555
    kDebug (14210) << k_funcinfo;
556
 
    myself ()->setProperty (Kopete::Global::Properties::self ()->nickName (),
557
 
                            displayName);
 
556
    myself ()->setNickName (displayName);
558
557
}
559
558
 
560
559
void
596
595
        WlmContact *contact = qobject_cast<WlmContact*>(contacts().value(buddy));
597
596
    if (contact)
598
597
    {
599
 
        contact->setProperty (Kopete::Global::Properties::self ()->
600
 
                              nickName (), friendlyname);
 
598
        contact->setNickName (friendlyname);
601
599
 
602
600
        // set contact properties
603
601
        contact->setProperty (WlmProtocol::protocol ()->contactCapabilities, QString::number(clientID));
795
793
                    if(!newcontact)
796
794
                        return;
797
795
 
798
 
                    newcontact->setProperty (Kopete::Global::Properties::self ()->nickName (), WlmUtils::utf8(b->friendlyName));
 
796
                    newcontact->setNickName (WlmUtils::utf8(b->friendlyName));
799
797
                }
800
798
 
801
799
                if (metacontact)
824
822
                        WlmContact *contact = qobject_cast<WlmContact*>(contacts().value( passport ));
825
823
                    if (contact)
826
824
                    {
827
 
                        contact->setProperty(Kopete::Global::Properties::self ()->nickName (), WlmUtils::utf8(b->friendlyName));
 
825
                        contact->setNickName(WlmUtils::utf8(b->friendlyName));
828
826
                        contact->setContactSerial(WlmUtils::latin1(b->properties["contactId"]));
829
827
                        kDebug (14210) << "ContactID: " << WlmUtils::latin1(b->properties["contactId"]);
830
828
                    }
1320
1318
            return;
1321
1319
 
1322
1320
        newcontact->setContactSerial (guid);
1323
 
        newcontact->setProperty (Kopete::Global::Properties::self()->nickName(), displayName);
 
1321
        newcontact->setNickName (displayName);
1324
1322
 
1325
1323
        QString groupName = m_contactAddQueue.value (passport);
1326
1324
        if( !groupName.isEmpty() && m_groupToGroupId.contains (groupName) )