Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-05-27 07:59:51 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-05-27 07:59:51 (GMT) |
| commit | 0bdb45be4aa66dcc478d5f061096b1adbaa3ab2c (patch) | |
| tree | bd9cbfea05d2edb45d59a0fe5ad43da95a705416 /Swift/Controllers/NickResolver.cpp | |
| parent | aeaa3ef7a62f2aba11df6e20262fd17cff0bf9e0 (diff) | |
| download | swift-0bdb45be4aa66dcc478d5f061096b1adbaa3ab2c.zip swift-0bdb45be4aa66dcc478d5f061096b1adbaa3ab2c.tar.bz2 | |
Show JIDs for users without nicks in the roster.
Resolves: #344
Diffstat (limited to 'Swift/Controllers/NickResolver.cpp')
| -rw-r--r-- | Swift/Controllers/NickResolver.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/NickResolver.cpp b/Swift/Controllers/NickResolver.cpp index c271a31..ed2c8df 100644 --- a/Swift/Controllers/NickResolver.cpp +++ b/Swift/Controllers/NickResolver.cpp @@ -29,9 +29,10 @@ String NickResolver::jidToNick(const JID& jid) { return jid.getResource(); } - if (xmppRoster_->containsJID(jid) && xmppRoster_->getNameForJID(jid) != "") { + if (xmppRoster_->containsJID(jid) && !xmppRoster_->getNameForJID(jid).isEmpty()) { return xmppRoster_->getNameForJID(jid); } + std::map<JID, String>::const_iterator it = map_.find(jid); return (it == map_.end()) ? jid.toBare() : it->second; } |