Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-05-04 14:15:53 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-05-04 14:43:41 (GMT) |
| commit | b2d3eae9fd085cd91b3efac53dca81fd450d5393 (patch) | |
| tree | 0bdb6f7359ffdd69ee81203e8faa435eaff7c633 /Swiften/Elements | |
| parent | 6af098245b58d484d9c86c1f832588455410750b (diff) | |
| download | swift-b2d3eae9fd085cd91b3efac53dca81fd450d5393.zip swift-b2d3eae9fd085cd91b3efac53dca81fd450d5393.tar.bz2 | |
Fix /me message handling for highlighted messages
Test-Information:
Added a unit test to test for the fix.
Tests pass on OS X 10.11.4.
Change-Id: Ibf071ae47663bfefdc856339932de6a1fe4a642d
Diffstat (limited to 'Swiften/Elements')
| -rw-r--r-- | Swiften/Elements/MUCItem.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Swiften/Elements/MUCItem.h b/Swiften/Elements/MUCItem.h index 9ea6d77..3c89e68 100644 --- a/Swiften/Elements/MUCItem.h +++ b/Swiften/Elements/MUCItem.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,9 +8,12 @@ #include <Swiften/Elements/MUCOccupant.h> #include <Swiften/JID/JID.h> + namespace Swift { struct MUCItem { MUCItem() {} + MUCItem(MUCOccupant::Affiliation affiliation, const JID& jid, MUCOccupant::Role role) : realJID(jid), affiliation(affiliation), role(role) {} + MUCItem(MUCOccupant::Affiliation affiliation, MUCOccupant::Role role) : affiliation(affiliation), role(role) {} boost::optional<JID> realJID; boost::optional<std::string> nick; boost::optional<MUCOccupant::Affiliation> affiliation; |