diff options
author | Kevin Smith <git@kismith.co.uk> | 2010-04-15 21:16:37 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2010-04-15 21:19:29 (GMT) |
commit | 1cf2023bc496a4abe5a98138401295b45a0b899a (patch) | |
tree | 8516e0132e9aaf197635ef9eb515b2e93256614c /Swift/Controllers/UIEvents | |
parent | bd8af5feb9b61f42c15cab77b19a58dfd93afa06 (diff) | |
download | swift-1cf2023bc496a4abe5a98138401295b45a0b899a.zip swift-1cf2023bc496a4abe5a98138401295b45a0b899a.tar.bz2 |
Normalise muc joining, allow it from bookmark list.
Resolves: #320
Diffstat (limited to 'Swift/Controllers/UIEvents')
-rw-r--r-- | Swift/Controllers/UIEvents/JoinMUCUIEvent.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h index 0bdfef1..4ebf1f1 100644 --- a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h +++ b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h @@ -4,10 +4,9 @@ * See Documentation/Licenses/GPLv3.txt for more information. */ -//Not used yet. - #pragma once +#include <boost/optional.hpp> #include "Swiften/Base/String.h" #include "Swift/Controllers/UIEvents/UIEvent.h" @@ -15,11 +14,11 @@ namespace Swift { class JoinMUCUIEvent : public UIEvent { public: - JoinMUCUIEvent(const JID& jid, const String& contact) : jid_(jid), contact_(contact) {}; - String getContact() {return contact_;}; + JoinMUCUIEvent(const JID& jid, const boost::optional<String>& nick) : jid_(jid), nick_(nick) {}; + boost::optional<String> getNick() {return nick_;}; JID getJID() {return jid_;}; private: - String contact_; JID jid_; + boost::optional<String> nick_; }; } |