From 3f5d0f1c999b293c9784bee6f56aa57ff1d5cf45 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 16 Aug 2010 06:36:57 +0000
Subject: make QXmppConfiguration::jidBare() return a sensible value when no
 user is set

---
 src/QXmppConfiguration.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/QXmppConfiguration.cpp')

diff --git a/src/QXmppConfiguration.cpp b/src/QXmppConfiguration.cpp
index 0abd6158..d55ee0d3 100644
--- a/src/QXmppConfiguration.cpp
+++ b/src/QXmppConfiguration.cpp
@@ -192,7 +192,10 @@ QString QXmppConfiguration::resource() const
 
 QString QXmppConfiguration::jid() const
 {
-    return jidBare() + "/" + m_resource;
+    if (m_user.isEmpty())
+        return m_domain;
+    else
+        return jidBare() + "/" + m_resource;
 }
 
 /// Returns the bare jabber id (jid), without the resource identifier.
@@ -203,7 +206,10 @@ QString QXmppConfiguration::jid() const
 
 QString QXmppConfiguration::jidBare() const
 {
-    return m_user+"@"+m_domain;
+    if (m_user.isEmpty())
+        return m_domain;
+    else
+        return m_user+"@"+m_domain;
 }
 
 /// Returns the auto-accept-subscriptions-request configuration.
@@ -439,12 +445,12 @@ QString QXmppConfiguration::getResource() const
 
 QString QXmppConfiguration::getJid() const
 {
-    return jidBare() + "/" + m_resource;
+    return jid();
 }
 
 QString QXmppConfiguration::getJidBare() const
 {
-    return m_user+"@"+m_domain;
+    return jidBare();
 }
 
 bool QXmppConfiguration::getAutoAcceptSubscriptions() const
-- 
cgit v1.2.3