From fd686f55a0a56755204799761e3d130d51c4ff4a 2013-02-27 09:54:59
From: Jan Kaluza <hanzz.k@gmail.com>
Date: 2013-02-27 09:54:59
Subject: [PATCH] Send raw presences also to rooms

---

diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 9cf799341ee6260169849f288bb957f636a0346f..4ea242e6628988ba51f9ff29fa2148997fa7d7d9 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -1453,6 +1453,8 @@ void NetworkPluginServer::handleUserPresenceChanged(User *user, Swift::Presence:
 	if (presence->getShow() == Swift::StatusShow::None)
 		return;
 
+	handleRawPresenceReceived(presence);
+
 	UserInfo userInfo = user->getUserInfo();
 
 	pbnetwork::Status status;
diff --git a/src/user.cpp b/src/user.cpp
index 9afab31af68f53b5f03c36c617c4398366129f91..301031b8cba910c94524823e5e5ef4eb41eb502c 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -258,6 +258,8 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {
 					delete conv;
 				}
 			}
+
+			return;
 		}
 		else if (isMUC) {
 			// force connection to legacy network to let backend to handle auto-join on connect.
@@ -315,8 +317,11 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {
 
 			onRawPresenceReceived(presence);
 			onRoomJoined(presence->getFrom(), room, presence->getTo().getResource(), password);
+
+			return;
 		}
-		return;
+
+		onRawPresenceReceived(presence);
 	}
 
 	int currentResourcesCount = m_presenceOracle->getAllPresence(m_jid).size();