Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-06-07 20:29:38 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-06-07 20:29:38 (GMT) |
| commit | 49d27079117c6b2763ff7c582815bc2a7b083a7f (patch) | |
| tree | a6bec2820d9e205585b5d4b7d3765653b2227a3b /Swift/Controllers/NickResolver.cpp | |
| parent | cca06e56679065f4b166a72623da36ddf598366e (diff) | |
| download | swift-49d27079117c6b2763ff7c582815bc2a7b083a7f.zip swift-49d27079117c6b2763ff7c582815bc2a7b083a7f.tar.bz2 | |
Don't resolve Nick for a bare MUC JID as an empty string.
Resolves: #435
Diffstat (limited to 'Swift/Controllers/NickResolver.cpp')
| -rw-r--r-- | Swift/Controllers/NickResolver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/NickResolver.cpp b/Swift/Controllers/NickResolver.cpp index ed2c8df..29ff51b 100644 --- a/Swift/Controllers/NickResolver.cpp +++ b/Swift/Controllers/NickResolver.cpp @@ -26,7 +26,7 @@ String NickResolver::jidToNick(const JID& jid) { String nick; if (mucRegistry_ && mucRegistry_->isMUC(jid.toBare()) ) { - return jid.getResource(); + return jid.getResource().isEmpty() ? jid.toBare().toString() : jid.getResource(); } if (xmppRoster_->containsJID(jid) && !xmppRoster_->getNameForJID(jid).isEmpty()) { |