← Back to branch summary

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

« back to all changes in this revision

Viewing changes to protocols/jabber/jabberbookmarks.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/jabberbookmarks.cpp
183
183
 
184
184
                                QString nickName = x_jid.resource();
185
185
                                if ( nickName.isEmpty() )
186
 
                                        nickName = m_account->myself()->nickName();
 
186
                                        nickName = m_account->myself()->displayName();
187
187
 
188
188
                                if ( bookmark.password().isEmpty() )
189
189
                                        m_account->client()->joinGroupChat( x_jid.domain(), x_jid.node(), nickName );