diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 21:25:17 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 21:25:17 +0100 |
| commit | dc1ad45aea9a10007a31ae449b1e0fe352a8a6cd (patch) | |
| tree | eb233ce97fc828e2edba69a82a1e7314b92771d3 /louloulibs/xmpp/jid.hpp | |
| parent | a077b304b27d21bf635ef4f31a2a0447d3b14d11 (diff) | |
| parent | f820d86aadb7a5473bcc0a0a3669732ab0182555 (diff) | |
| download | biboumi-dc1ad45aea9a10007a31ae449b1e0fe352a8a6cd.tar.gz biboumi-dc1ad45aea9a10007a31ae449b1e0fe352a8a6cd.tar.bz2 biboumi-dc1ad45aea9a10007a31ae449b1e0fe352a8a6cd.tar.xz biboumi-dc1ad45aea9a10007a31ae449b1e0fe352a8a6cd.zip | |
Merge tag 'upstream/4.0'
Upstream version 4.0
# gpg: Signature made Wed Dec 21 21:25:11 2016 CET
# gpg: using RSA key 2C7C3146C1A00121
# gpg: Good signature from "Jonas Smedegaard <dr@jones.dk>"
# gpg: aka "Jonas Smedegaard <jonas@homebase.dk>"
# gpg: aka "Jonas Smedegaard <js@debian.org>"
# gpg: aka "[jpeg image of size 4165]"
Diffstat (limited to 'louloulibs/xmpp/jid.hpp')
| -rw-r--r-- | louloulibs/xmpp/jid.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/louloulibs/xmpp/jid.hpp b/louloulibs/xmpp/jid.hpp index 08327ef..85e835c 100644 --- a/louloulibs/xmpp/jid.hpp +++ b/louloulibs/xmpp/jid.hpp @@ -26,7 +26,12 @@ public: } std::string full() const { - return this->local + "@" + this->domain + "/" + this->resource; + std::string res = this->domain; + if (!this->local.empty()) + res = this->local + "@" + this->domain; + if (!this->resource.empty()) + res += "/" + this->resource; + return res; } }; |