1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/Roster/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp
index 73efa43..751ca32 100644
--- a/Swift/Controllers/Roster/RosterController.cpp
+++ b/Swift/Controllers/Roster/RosterController.cpp
@@ -77,11 +77,10 @@ RosterController::RosterController(const JID& jid, XMPPRoster* xmppRoster, Avata
        xmppRoster_->onJIDAdded.connect(boost::bind(&RosterController::handleOnJIDAdded, this, _1));
        xmppRoster_->onJIDUpdated.connect(boost::bind(&RosterController::handleOnJIDUpdated, this, _1, _2, _3));
        xmppRoster_->onJIDRemoved.connect(boost::bind(&RosterController::handleOnJIDRemoved, this, _1));
        xmppRoster_->onRosterCleared.connect(boost::bind(&RosterController::handleRosterCleared, this));
        subscriptionManager_->onPresenceSubscriptionRequest.connect(boost::bind(&RosterController::handleSubscriptionRequest, this, _1, _2));
-        presenceOracle_->onPresenceChange.connect(boost::bind(&RosterController::handleIncomingPresence, this, _1));
        uiEventConnection_ = uiEventStream->onUIEvent.connect(boost::bind(&RosterController::handleUIEvent, this, _1));
        vcardManager_->onOwnVCardChanged.connect(boost::bind(&RosterController::handleOwnVCardChanged, this, _1));
        avatarManager_->onAvatarChanged.connect(boost::bind(&RosterController::handleAvatarChanged, this, _1));
        presenceOracle_->onPresenceChange.connect(boost::bind(&RosterController::handlePresenceChanged, this, _1));
@@ -332,11 +331,12 @@ void RosterController::handleRosterSetError(ErrorPayload::ref error, boost::shar
 void RosterController::handleIncomingPresence(Presence::ref newPresence) {
        if (newPresence->getType() == Presence::Error) {
                return;
        }
-        roster_->applyOnItems(SetPresence(newPresence));
+        Presence::ref accountPresence = presenceOracle_->getAccountPresence(newPresence->getFrom().toBare());
+        roster_->applyOnItems(SetPresence(accountPresence));
 }
 void RosterController::handleSubscriptionRequest(const JID& jid, const std::string& message) {
        if (xmppRoster_->containsJID(jid) && (xmppRoster_->getSubscriptionStateForJID(jid) == RosterItemPayload::To || xmppRoster_->getSubscriptionStateForJID(jid) == RosterItemPayload::Both)) {
                subscriptionManager_->confirmSubscription(jid);
@@ -378,10 +378,13 @@ void RosterController::handleAvatarChanged(const JID& jid) {
 void RosterController::handlePresenceChanged(Presence::ref presence) {
        if (presence->getFrom().equals(myJID_, JID::WithResource)) {
                ownContact_->applyPresence(std::string(), presence);
                mainWindow_->setMyContactRosterItem(ownContact_);
        }
+        else {
+                handleIncomingPresence(presence);
+        }
 }
 boost::optional<XMPPRosterItem> RosterController::getItem(const JID& jid) const {
        return xmppRoster_->getItem(jid);
 }