Swiftdiff 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/Chat/ChatsManager.h | |
| parent | bd8af5feb9b61f42c15cab77b19a58dfd93afa06 (diff) | |
| download | swift-contrib-1cf2023bc496a4abe5a98138401295b45a0b899a.zip swift-contrib-1cf2023bc496a4abe5a98138401295b45a0b899a.tar.bz2 | |
Normalise muc joining, allow it from bookmark list.
Resolves: #320
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.h')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h index 6dc598e..df49b0a 100644 --- a/Swift/Controllers/Chat/ChatsManager.h +++ b/Swift/Controllers/Chat/ChatsManager.h @@ -44,8 +44,8 @@ namespace Swift { void setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info); void handleIncomingMessage(boost::shared_ptr<Message> message); void handleChatRequest(const String& contact); - void handleJoinMUCRequest(const JID& muc, const String& nick); private: + void handleJoinMUCRequest(const JID& muc, const boost::optional<String>& nick); void rebindControllerJID(const JID& from, const JID& to); void handlePresenceChange(boost::shared_ptr<Presence> newPresence, boost::shared_ptr<Presence> lastPresence); void handleUIEvent(boost::shared_ptr<UIEvent> event); |