From 85c7230172a9176080a8342bcf6fcf7896bdb45e Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Tue, 29 Jun 2010 07:43:55 +0000
Subject: move subscription auto-accept to QXmppRoster

---
 source/QXmppStream.cpp | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

(limited to 'source/QXmppStream.cpp')

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index f311284f..6898a51b 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -726,7 +726,8 @@ void QXmppStream::parser(const QByteArray& data)
                     QXmppPresence presence;
                     presence.parse(nodeRecv);
 
-                    processPresence(presence);
+                    // emit presence
+                    emit presenceReceived(presence);
                 }
                 else if(nodeRecv.tagName() == "message")
                 {
@@ -996,37 +997,6 @@ bool QXmppStream::sendPacket(const QXmppPacket& packet)
     return sendToServer(data);
 }
 
-// FIXME : should this be moved to QXmppRoster?
-void QXmppStream::processPresence(const QXmppPresence& presence)
-{
-    switch(presence.type())
-    {
-    case QXmppPresence::Error:
-        break;
-    case QXmppPresence::Available:
-        break;
-    case QXmppPresence::Unavailable:
-        break;
-    case QXmppPresence::Subscribe:
-        if(!presence.from().isEmpty())
-        {
-            if(configuration().autoAcceptSubscriptions())
-                acceptSubscriptionRequest(presence.from());
-            emit subscriptionRequestReceived(presence.from());
-        }
-        break;
-    case QXmppPresence::Unsubscribe:
-        break;
-    case QXmppPresence::Unsubscribed:
-        break;
-    case QXmppPresence::Probe:
-        break;
-    default:
-        break;
-    }
-    emit presenceReceived(presence);
-}
-
 void QXmppStream::sendEndStream()
 {
     sendToServer(streamRootElementEnd);
-- 
cgit v1.2.3