← Back to branch summary

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

« back to all changes in this revision

Viewing changes to protocols/gadu/gaduaccount.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/gadu/gaduaccount.cpp
183
183
 
184
184
        QString nick = p->config->readEntry( QString::fromAscii( "nickName" ), QString() );
185
185
        if ( !nick.isNull() ) {
186
 
                myself()->setProperty( Kopete::Global::Properties::self()->nickName(), nick );
187
 
        }
188
 
        else {
189
 
                myself()->setProperty( Kopete::Global::Properties::self()->nickName(), accountId() );
190
 
                p->config->writeEntry( QString::fromAscii( "nickName" ), accountId() );
 
186
                myself()->setNickName( nick );
191
187
        }
192
188
}
193
189
 
286
282
 
287
283
        actionMenu->setIcon( myself()->onlineStatus().iconFor( this ) );
288
284
        actionMenu->menu()->addTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> ",
289
 
            myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) );
 
285
            myself()->displayName(), accountId() ) );
290
286
 
291
287
        if ( p->session_->isConnected() ) {
292
288
                p->searchAction->setEnabled( true );
1038
1034
                                        Kopete::UI::Global::mainWidget() );
1039
1035
        p->saveListDialog->setCaption(
1040
1036
            i18n("Save Contacts List for Account %1 As",
1041
 
            myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) );
 
1037
            myself()->displayName() ) );
1042
1038
 
1043
1039
        if ( p->saveListDialog->exec() == QDialog::Accepted ) {
1044
1040
                QByteArray list = p->textcodec_->fromUnicode( userlist()->asString() );
1084
1080
                                        Kopete::UI::Global::mainWidget() );
1085
1081
        p->loadListDialog->setCaption(
1086
1082
            i18n("Load Contacts List for Account %1 As",
1087
 
            myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) );
 
1083
            myself()->displayName() ) );
1088
1084
 
1089
1085
        if ( p->loadListDialog->exec() == QDialog::Accepted ) {
1090
1086
                url = p->loadListDialog->selectedUrl();