From 88f6b066329baff9ee6dfa9279872b7bcf31abdb Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 6 Feb 2012 21:11:30 +0000
Subject: keep QXmppMessageReceiptManager API minimal

---
 src/QXmppMessageReceiptManager.cpp | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'src/QXmppMessageReceiptManager.cpp')

diff --git a/src/QXmppMessageReceiptManager.cpp b/src/QXmppMessageReceiptManager.cpp
index 09a4a7c2..b78c1a77 100644
--- a/src/QXmppMessageReceiptManager.cpp
+++ b/src/QXmppMessageReceiptManager.cpp
@@ -35,32 +35,9 @@
 
 QXmppMessageReceiptManager::QXmppMessageReceiptManager()
     : QXmppClientExtension()
-    , m_autoReceipt(true)
 {
 }
 
-bool QXmppMessageReceiptManager::autoReceipt() const
-{
-    return m_autoReceipt;
-}
-
-void QXmppMessageReceiptManager::setAutoReceipt(bool autoReceipt)
-{
-    m_autoReceipt = autoReceipt;
-}
-
-/** Sends a receipt for the specified message.
- */
-void QXmppMessageReceiptManager::sendReceipt(const QString &jid, const QString &id)
-{
-    if (!jid.isEmpty() && !id.isEmpty()) {
-        QXmppMessage msg;
-        msg.setTo(jid);
-        msg.setReceiptId(id);
-        client()->sendPacket(msg);
-    }
-}
-
 QStringList QXmppMessageReceiptManager::discoveryFeatures() const
 {
     return QStringList(ns_message_receipts);
@@ -80,9 +57,15 @@ bool QXmppMessageReceiptManager::handleStanza(const QDomElement &stanza)
         return true;
     }
 
-    // If autoreceipt is enabled, send a receipt.
-    if (m_autoReceipt && message.isReceiptRequested())
-        sendReceipt(message.from(), message.id());
+    // If requested, send a receipt.
+    if (message.isReceiptRequested()
+        && !message.from().isEmpty()
+        && !message.id().isEmpty()) {
+        QXmppMessage receipt;
+        receipt.setTo(message.from());
+        receipt.setReceiptId(message.id());
+        client()->sendPacket(receipt);
+    }
 
     // Continue processing.
     return false;
-- 
cgit v1.2.3