From f771028d022c2ba0c05759ffad41c2afc84d03c2 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Wed, 19 Jan 2011 13:36:15 +0000
Subject: do not set iq "from" gratuitously

---
 src/QXmppDiscoveryManager.cpp  | 6 ++----
 src/QXmppEntityTimeManager.cpp | 3 +--
 src/QXmppOutgoingClient.cpp    | 3 ---
 src/QXmppVCardManager.cpp      | 2 +-
 src/QXmppVersionManager.cpp    | 3 +--
 5 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/QXmppDiscoveryManager.cpp b/src/QXmppDiscoveryManager.cpp
index ca00c5c3..a9afe89d 100644
--- a/src/QXmppDiscoveryManager.cpp
+++ b/src/QXmppDiscoveryManager.cpp
@@ -82,13 +82,12 @@ QString QXmppDiscoveryManager::requestInfo(const QString& jid, const QString& no
     request.setType(QXmppIq::Get);
     request.setQueryType(QXmppDiscoveryIq::InfoQuery);
     request.setTo(jid);
-    request.setFrom(client()->configuration().jid());
     if(!node.isEmpty())
         request.setQueryNode(node);
     if(client()->sendPacket(request))
         return request.id();
     else
-        return "";
+        return QString();
 }
 
 /// Requests items from the specified XMPP entity.
@@ -102,13 +101,12 @@ QString QXmppDiscoveryManager::requestItems(const QString& jid, const QString& n
     request.setType(QXmppIq::Get);
     request.setQueryType(QXmppDiscoveryIq::ItemsQuery);
     request.setTo(jid);
-    request.setFrom(client()->configuration().jid());
     if(!node.isEmpty())
         request.setQueryNode(node);
     if(client()->sendPacket(request))
         return request.id();
     else
-        return "";
+        return QString();
 }
 
 QStringList QXmppDiscoveryManager::discoveryFeatures() const
diff --git a/src/QXmppEntityTimeManager.cpp b/src/QXmppEntityTimeManager.cpp
index 6a3faa2a..e11d65f0 100644
--- a/src/QXmppEntityTimeManager.cpp
+++ b/src/QXmppEntityTimeManager.cpp
@@ -40,12 +40,11 @@ QString QXmppEntityTimeManager::requestTime(const QString& jid)
 {
     QXmppEntityTimeIq request;
     request.setType(QXmppIq::Get);
-    request.setFrom(client()->configuration().jid());
     request.setTo(jid);
     if(client()->sendPacket(request))
         return request.id();
     else
-        return "";
+        return QString();
 }
 
 QStringList QXmppEntityTimeManager::discoveryFeatures() const
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index cc7b9f92..2c4e26f0 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -513,7 +513,6 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                 QXmppIq iq(QXmppIq::Result);
                 iq.setId(req.id());
                 iq.setTo(req.from());
-                iq.setFrom(req.to());
                 sendPacket(iq);
             }
             else
@@ -528,7 +527,6 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                     QXmppIq iq(QXmppIq::Error);
                     iq.setId(iqPacket.id());
                     iq.setTo(iqPacket.from());
-                    iq.setFrom(iqPacket.to());
                     QXmppStanza::Error error(QXmppStanza::Error::Cancel,
                         QXmppStanza::Error::FeatureNotImplemented);
                     iq.setError(error);
@@ -579,7 +577,6 @@ void QXmppOutgoingClient::pingSend()
 {
     // send ping packet
     QXmppPingIq ping;
-    ping.setFrom(configuration().jid());
     ping.setTo(configuration().domain());
     sendPacket(ping);
 
diff --git a/src/QXmppVCardManager.cpp b/src/QXmppVCardManager.cpp
index 7535d13b..58319f1c 100644
--- a/src/QXmppVCardManager.cpp
+++ b/src/QXmppVCardManager.cpp
@@ -76,7 +76,7 @@ QString QXmppVCardManager::requestVCard(const QString& jid)
     if(client()->sendPacket(request))
         return request.id();
     else
-        return "";
+        return QString();
 }
 
 /// Returns the vCard of the connected client.
diff --git a/src/QXmppVersionManager.cpp b/src/QXmppVersionManager.cpp
index 67d50e01..246e1797 100644
--- a/src/QXmppVersionManager.cpp
+++ b/src/QXmppVersionManager.cpp
@@ -94,12 +94,11 @@ QString QXmppVersionManager::requestVersion(const QString& jid)
 {
     QXmppVersionIq request;
     request.setType(QXmppIq::Get);
-    request.setFrom(client()->configuration().jid());
     request.setTo(jid);
     if(client()->sendPacket(request))
         return request.id();
     else
-        return "";
+        return QString();
 }
 
 /// Sets the local XMPP client's name.
-- 
cgit v1.2.3