4 files changed, 6 insertions, 6 deletions
diff --git a/Swift/Controllers/Roster/ContactRosterItem.cpp b/Swift/Controllers/Roster/ContactRosterItem.cpp
index ae05aee..3258fb5 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.cpp
+++ b/Swift/Controllers/Roster/ContactRosterItem.cpp
@@ -92,11 +92,11 @@ typedef std::pair<std::string, boost::shared_ptr<Presence> > StringPresencePair;
 void ContactRosterItem::clearPresence() {
        presence_.reset();
        onDataChanged();
 }
-void ContactRosterItem::applyPresence(const std::string& resource, boost::shared_ptr<Presence> presence) {
+void ContactRosterItem::applyPresence(boost::shared_ptr<Presence> presence) {
        presence_ = presence;
        onDataChanged();
 }
 const std::vector<std::string>& ContactRosterItem::getGroups() const {
diff --git a/Swift/Controllers/Roster/ContactRosterItem.h b/Swift/Controllers/Roster/ContactRosterItem.h
index ec04a8c..d21935c 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.h
+++ b/Swift/Controllers/Roster/ContactRosterItem.h
@@ -53,11 +53,11 @@ class ContactRosterItem : public RosterItem {
                void setAvatarPath(const boost::filesystem::path& path);
                const boost::filesystem::path& getAvatarPath() const;
                const JID& getJID() const;
                void setDisplayJID(const JID& jid);
                const JID& getDisplayJID() const;
-                void applyPresence(const std::string& resource, boost::shared_ptr<Presence> presence);
+                void applyPresence(boost::shared_ptr<Presence> presence);
                const std::vector<std::string>& getGroups() const;
                /** Only used so a contact can know about the groups it's in*/
                void addGroup(const std::string& group);
                void removeGroup(const std::string& group);
                void clearPresence();
diff --git a/Swift/Controllers/Roster/ItemOperations/SetPresence.h b/Swift/Controllers/Roster/ItemOperations/SetPresence.h
index 0b54237..2b5bbbe 100644
--- a/Swift/Controllers/Roster/ItemOperations/SetPresence.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetPresence.h
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #pragma once
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
 namespace Swift {
 class RosterItem;
@@ -22,11 +22,11 @@ class SetPresence : public RosterItemOperation {
                }
                virtual void operator() (RosterItem* item) const {
                        ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
                        if (contact && contact->getJID().equals(presence_->getFrom(), compareType_)) {
-                                contact->applyPresence(presence_->getFrom().getResource(), presence_);
+                                contact->applyPresence(presence_);
                        }
                }
        
        private:
                Presence::ref presence_;
diff --git a/Swift/Controllers/Roster/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp
index 751ca32..75acaa9 100644
--- a/Swift/Controllers/Roster/RosterController.cpp
+++ b/Swift/Controllers/Roster/RosterController.cpp
@@ -375,11 +375,11 @@ void RosterController::handleAvatarChanged(const JID& jid) {
        }
 }
 void RosterController::handlePresenceChanged(Presence::ref presence) {
        if (presence->getFrom().equals(myJID_, JID::WithResource)) {
-                ownContact_->applyPresence(std::string(), presence);
+                ownContact_->applyPresence(presence);
                mainWindow_->setMyContactRosterItem(ownContact_);
        }
        else {
                handleIncomingPresence(presence);
        }