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/QtUI/QtMainWindow.cpp | |
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/QtUI/QtMainWindow.cpp')
-rw-r--r-- | Swift/QtUI/QtMainWindow.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp index 116f52e..c947ae7 100644 --- a/Swift/QtUI/QtMainWindow.cpp +++ b/Swift/QtUI/QtMainWindow.cpp @@ -6,6 +6,8 @@ #include "QtMainWindow.h" +#include <boost/optional.hpp> + #include <QBoxLayout> #include <QComboBox> #include <QLineEdit> @@ -24,6 +26,7 @@ #include "Roster/QtTreeWidgetFactory.h" #include "Roster/QtTreeWidget.h" #include "Swift/Controllers/UIEvents/AddContactUIEvent.h" +#include "Swift/Controllers/UIEvents/JoinMUCUIEvent.h" namespace Swift { @@ -137,7 +140,9 @@ void QtMainWindow::handleJoinMUCAction() { } void QtMainWindow::handleJoinMUCDialogComplete(const JID& muc, const QString& nick) { - onJoinMUCRequest(muc, Q2PSTRING(nick)); + boost::optional<String> maybeNick(Q2PSTRING(nick)); + boost::shared_ptr<UIEvent> event(new JoinMUCUIEvent(muc, maybeNick)); + uiEventStream_->send(event); } void QtMainWindow::handleStatusChanged(StatusShow::Type showType, const QString &statusMessage) { |