summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-10-19 11:03:21 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-10-19 15:36:21 (GMT)
commit30359b48e18bcf171a53d50d84a178b9cb376d7a (patch)
tree42b59ff30433bf7d3f164aa64639312e865d2d4b /Swiften/MUC
parentb951e04a08f368dad564995813323fd098c70e95 (diff)
downloadswift-contrib-30359b48e18bcf171a53d50d84a178b9cb376d7a.zip
swift-contrib-30359b48e18bcf171a53d50d84a178b9cb376d7a.tar.bz2
Use real JID for bans, not room JID.
Resolves: #1020
Diffstat (limited to 'Swiften/MUC')
-rw-r--r--Swiften/MUC/MUC.cpp2
-rw-r--r--Swiften/MUC/MUC.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp
index 824ced1..78546c8 100644
--- a/Swiften/MUC/MUC.cpp
+++ b/Swiften/MUC/MUC.cpp
@@ -233,7 +233,7 @@ bool MUC::hasOccupant(const std::string& nick) {
return occupants.find(nick) != occupants.end();
}
-MUCOccupant MUC::getOccupant(const std::string& nick) {
+const MUCOccupant& MUC::getOccupant(const std::string& nick) {
return occupants.find(nick)->second;
}
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index 1070c69..39acb22 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -54,7 +54,7 @@ namespace Swift {
/** Expose public so it can be called when e.g. user goes offline */
void handleUserLeft(LeavingType);
/** Get occupant information*/
- MUCOccupant getOccupant(const std::string& nick);
+ const MUCOccupant& getOccupant(const std::string& nick);
bool hasOccupant(const std::string& nick);
void kickOccupant(const JID& jid);
void changeOccupantRole(const JID& jid, MUCOccupant::Role role);