Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-21 17:17:48 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-05-27 16:08:27 (GMT) |
| commit | b5fc545c5f19d35c877514b30ba07303d0c9793d (patch) | |
| tree | af5ee34480949cd9dc76460045580da835402688 /Swift/QtUI/UserSearch/QtUserSearchWindow.cpp | |
| parent | 2b54d28e975cb5fe36850b633f948952b58ef628 (diff) | |
| download | swift-b5fc545c5f19d35c877514b30ba07303d0c9793d.zip swift-b5fc545c5f19d35c877514b30ba07303d0c9793d.tar.bz2 | |
Allow to invite multiple contacts to a chat room at once
There was a bug that prevented to drag multiple contacts
in the invite dialog list. The restriction for impromptu
conversation rooms is now only applied if no local MUC service
is found and the dialog is a 'Chat to Users' dialog.
Test-Information:
Tested that you can now drag multiple contacts into the
invite dialog.
Tested on OS X 10.11.4 with Qt 5.4.2.
Change-Id: I50b0bb191570f32cfa054e415c993b1fb57073ad
Diffstat (limited to 'Swift/QtUI/UserSearch/QtUserSearchWindow.cpp')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchWindow.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp index 434da38..e00582c 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp @@ -15,8 +15,6 @@ #include <QMovie> #include <QWizardPage> -#include <Swiften/Base/Log.h> - #include <Swift/Controllers/UIEvents/AddContactUIEvent.h> #include <Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h> #include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h> @@ -433,7 +431,7 @@ void QtUserSearchWindow::addContacts(const std::vector<Contact::ref>& contacts) contactVector_.push_back(newContact); } } - if (!supportsImpromptu_ && contactVector_.size() > 1) { + if (type_ != InviteToChat && !supportsImpromptu_ && contactVector_.size() > 1) { contactVector_.resize(1); /* can't chat with more than one user */ } firstMultiJIDPage_->contactList_->setList(contactVector_); |