summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoanna Hulboj <joanna.hulboj@isode.com>2017-02-15 16:21:26 (GMT)
committerKevin Smith <kevin.smith@isode.com>2017-02-23 18:07:40 (GMT)
commit3861c418f95555a623d3e8005c75da9b9bbcd1e1 (patch)
treed8fbfb1bb6a1a3b1c5d620f0e25d41df215467d1 /Swiften
parent8803538bc29a3b68d3c69d900f41ddd1b383cec6 (diff)
downloadswift-3861c418f95555a623d3e8005c75da9b9bbcd1e1.zip
swift-3861c418f95555a623d3e8005c75da9b9bbcd1e1.tar.bz2
Change the logic of displaying chat room subject
Test-Information: Run Swift and join any MUC room, on join there is no information displayed regarding room subject. Choose "Change subject", the following information is displayed in the chat window: "The room subject has been removed" after the subject was removed, or "The room subject is now: some subject" after the room subject was set to "some subject". Run Swift join any MUC room, disconnect from server (using another Swift client change subject to "Test") after reconnecting the following information is displayed in chat window: "The room subject is now: Test" Change-Id: Ice901697a6a381464d694147b17830b4e62c8198
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/MUC/UnitTest/MockMUC.cpp4
-rw-r--r--Swiften/MUC/UnitTest/MockMUC.h5
2 files changed, 8 insertions, 1 deletions
diff --git a/Swiften/MUC/UnitTest/MockMUC.cpp b/Swiften/MUC/UnitTest/MockMUC.cpp
index 93e7d0b..d9bf348 100644
--- a/Swiften/MUC/UnitTest/MockMUC.cpp
+++ b/Swiften/MUC/UnitTest/MockMUC.cpp
@@ -10,6 +10,7 @@ namespace Swift {
MockMUC::MockMUC(const JID &muc)
: ownMUCJID(muc)
+, newSubjectSet_("")
{
}
@@ -47,5 +48,8 @@ void MockMUC::changeOccupantRole(const JID &jid, MUCOccupant::Role newRole) {
onOccupantRoleChanged(i->first, i->second, old.getRole());
}
}
+void MockMUC::changeSubject(const std::string& newSubject) {
+ newSubjectSet_ = newSubject;
+}
}
diff --git a/Swiften/MUC/UnitTest/MockMUC.h b/Swiften/MUC/UnitTest/MockMUC.h
index becfa72..4c5ce8d 100644
--- a/Swiften/MUC/UnitTest/MockMUC.h
+++ b/Swiften/MUC/UnitTest/MockMUC.h
@@ -72,7 +72,7 @@ namespace Swift {
virtual void changeOccupantRole(const JID&, MUCOccupant::Role);
virtual void requestAffiliationList(MUCOccupant::Affiliation) {}
virtual void changeAffiliation(const JID&, MUCOccupant::Affiliation);
- virtual void changeSubject(const std::string&) {}
+ virtual void changeSubject(const std::string&);
virtual void requestConfigurationForm() {}
virtual void configureRoom(Form::ref) {}
virtual void cancelConfigureRoom() {}
@@ -94,5 +94,8 @@ namespace Swift {
private:
JID ownMUCJID;
std::map<std::string, MUCOccupant> occupants_;
+
+ public:
+ std::string newSubjectSet_;
};
}