summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-10-22 16:26:11 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-10-22 16:26:11 (GMT)
commit7cac59f3ec12e3440341bb561ab3c8e6c3fe80e0 (patch)
tree7198b2fb67e8376c6247d645e793d3e567ec5aed /Swift/Controllers/Chat/MUCController.h
parent991f0774c006a2c9a0998090dae4729059cc72b6 (diff)
downloadswift-7cac59f3ec12e3440341bb561ab3c8e6c3fe80e0.zip
swift-7cac59f3ec12e3440341bb561ab3c8e6c3fe80e0.tar.bz2
Be smarter about combining JoinParts in MUCs.
Resolves: 620 Release-Notes: Joins and parts in MUCs will now be merged in a more natural way.
Diffstat (limited to 'Swift/Controllers/Chat/MUCController.h')
-rw-r--r--Swift/Controllers/Chat/MUCController.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index 6924b48..2a6536c 100644
--- a/Swift/Controllers/Chat/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -47,7 +47,8 @@ namespace Swift {
virtual void setOnline(bool online);
void rejoin();
static void appendToJoinParts(std::vector<NickJoinPart>& joinParts, const NickJoinPart& newEvent);
- static String generateJoinPartString(std::vector<NickJoinPart> joinParts);
+ static String generateJoinPartString(const std::vector<NickJoinPart>& joinParts);
+ static String concatenateListOfNames(const std::vector<NickJoinPart>& joinParts);
protected:
void preSendMessageRequest(boost::shared_ptr<Message> message);
@@ -77,6 +78,7 @@ namespace Swift {
bool shouldUpdateJoinParts();
void dayTicked() {lastWasPresence_ = false;}
void processUserPart();
+
private:
MUC* muc_;
UIEventStream* events_;