2 files changed, 8 insertions, 2 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index e00582c..cf62540 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -118,67 +118,67 @@ void QtUserSearchWindow::handleCurrentChanged(int page) {
     lastPage_ = page;
 }
 
 JID QtUserSearchWindow::getServerToSearch() {
     if (type_ == AddContact) {
         return firstPage_->byRemoteSearch_->isChecked() ? JID(Q2PSTRING(firstPage_->service_->currentText().trimmed())) : myServer_;
     } else {
         return firstMultiJIDPage_->byRemoteSearch_->isChecked() ? JID(Q2PSTRING(firstMultiJIDPage_->service_->currentText().trimmed())) : myServer_;
     }
 }
 
 void QtUserSearchWindow::handleAccepted() {
     JID jid;
     std::vector<JID> jids;
     switch(type_) {
         case AddContact:
             jid = getContactJID();
             eventStream_->send(std::make_shared<AddContactUIEvent>(jid, detailsPage_->getName(), detailsPage_->getSelectedGroups()));
             break;
         case ChatToContact:
             if (contactVector_.size() == 1) {
                 std::shared_ptr<UIEvent> event(new RequestChatUIEvent(contactVector_[0]->jid));
                 eventStream_->send(event);
                 break;
             }
 
             for (Contact::ref contact : contactVector_) {
                 jids.push_back(contact->jid);
             }
 
-            eventStream_->send(std::make_shared<CreateImpromptuMUCUIEvent>(jids, JID(), Q2PSTRING(firstMultiJIDPage_->reason_->text())));
+            eventStream_->send(std::make_shared<CreateImpromptuMUCUIEvent>(jids, Q2PSTRING(firstMultiJIDPage_->reason_->text())));
             break;
         case InviteToChat:
             for (Contact::ref contact : contactVector_) {
                 jids.push_back(contact->jid);
             }
-            eventStream_->send(std::make_shared<InviteToMUCUIEvent>(roomJID_, jids, Q2PSTRING(firstMultiJIDPage_->reason_->text())));
+            eventStream_->send(std::make_shared<InviteToMUCUIEvent>(originatorJID_, jids, Q2PSTRING(firstMultiJIDPage_->reason_->text())));
             break;
     }
 }
 
 void QtUserSearchWindow::handleContactSuggestionRequested(const QString& text) {
     std::string stdText = Q2PSTRING(text);
     onContactSuggestionsRequested(stdText);
 }
 
 void QtUserSearchWindow::addContact() {
     auto contactToAdd = firstMultiJIDPage_->jid_->getContact();
     if (!!contactToAdd) {
         contactVector_.push_back(contactToAdd);
         firstMultiJIDPage_->jid_->clear();
     }
 
     firstMultiJIDPage_->contactList_->setList(contactVector_);
     firstMultiJIDPage_->emitCompletenessCheck();
     if (type_ == ChatToContact) {
         firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
     }
 
     if (!!contactToAdd && contactToAdd->jid.isValid() && contactToAdd->statusType == StatusShow::None) {
         onJIDUpdateRequested({contactToAdd->jid});
     }
 }
 
 void QtUserSearchWindow::setWarning(const boost::optional<std::string>& message) {
     if (message) {
         firstPage_->jidWarning_->setToolTip(P2QSTRING((*message)));
@@ -360,60 +360,64 @@ void QtUserSearchWindow::setSearchFields(std::shared_ptr<SearchPayload> fields)
 void QtUserSearchWindow::setNameSuggestions(const std::vector<std::string>& suggestions) {
     if (detailsPage_) {
         detailsPage_->setNameSuggestions(suggestions);
     }
 }
 
 void QtUserSearchWindow::prepopulateJIDAndName(const JID& jid, const std::string& name) {
     firstPage_->jid_->setText(P2QSTRING(jid.toBare().toString()));
     detailsPage_->setJID(jid);
     lastPage_ = 1;
     restart();
     next();
     detailsPage_->setName(name);
 }
 
 void QtUserSearchWindow::setContactSuggestions(const std::vector<Contact::ref>& suggestions) {
     if (type_ == AddContact) {
         firstPage_->jid_->setSuggestions(suggestions);
     } else {
         firstMultiJIDPage_->jid_->setSuggestions(suggestions);
     }
 }
 
 void QtUserSearchWindow::setJIDs(const std::vector<JID> &jids) {
     for (auto&& jid : jids) {
         addSearchedJIDToList(std::make_shared<Contact>("", jid, StatusShow::None, ""));
     }
     onJIDUpdateRequested(jids);
 }
 
+void QtUserSearchWindow::setOriginator(const JID& originator) {
+    originatorJID_ = originator;
+}
+
 void QtUserSearchWindow::setRoomJID(const JID& roomJID) {
     roomJID_ = roomJID;
 }
 
 std::string QtUserSearchWindow::getReason() const {
     return Q2PSTRING(firstMultiJIDPage_->reason_->text());
 }
 
 std::vector<JID> QtUserSearchWindow::getJIDs() const {
     std::vector<JID> jids;
     for (Contact::ref contact : contactVector_) {
         jids.push_back(contact->jid);
     }
     return jids;
 }
 
 void QtUserSearchWindow::setCanStartImpromptuChats(bool supportsImpromptu) {
     supportsImpromptu_ = supportsImpromptu;
     if (type_ == ChatToContact) {
         firstMultiJIDPage_->contactList_->setMaximumNoOfContactsToOne(!supportsImpromptu_);
     }
 }
 
 void QtUserSearchWindow::updateContacts(const std::vector<Contact::ref>& contacts) {
     if (type_ != AddContact) {
         firstMultiJIDPage_->contactList_->updateContacts(contacts);
     }
 }
 
 void QtUserSearchWindow::addContacts(const std::vector<Contact::ref>& contacts) {
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index 5d8b755..b9d4698 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -20,87 +20,89 @@ namespace Swift {
     class UserSearchResult;
     class UIEventStream;
     class QtUserSearchFirstPage;
     class QtUserSearchFirstMultiJIDPage;
     class QtUserSearchFieldsPage;
     class QtUserSearchResultsPage;
     class QtUserSearchDetailsPage;
     class QtFormResultItemModel;
     class SettingsProvider;
 
     class QtUserSearchWindow : public QWizard, public UserSearchWindow, private Ui::QtUserSearchWizard {
         Q_OBJECT
         public:
             QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider);
             virtual ~QtUserSearchWindow();
 
             virtual void addSavedServices(const std::vector<JID>& services);
 
             virtual void clear();
             virtual void show();
             virtual void setResults(const std::vector<UserSearchResult>& results);
             virtual void setResultsForm(Form::ref results);
             virtual void setSelectedService(const JID& jid);
             virtual void setServerSupportsSearch(bool error);
             virtual void setSearchError(bool error);
             virtual void setSearchFields(std::shared_ptr<SearchPayload> fields);
             virtual void setNameSuggestions(const std::vector<std::string>& suggestions);
             virtual void prepopulateJIDAndName(const JID& jid, const std::string& name);
             virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions);
             virtual void setJIDs(const std::vector<JID> &jids);
+            virtual void setOriginator(const JID& originator);
             virtual void setRoomJID(const JID &roomJID);
             virtual std::string getReason() const;
             virtual std::vector<JID> getJIDs() const;
             virtual void setCanStartImpromptuChats(bool supportsImpromptu);
             virtual void updateContacts(const std::vector<Contact::ref> &contacts);
             virtual void addContacts(const std::vector<Contact::ref>& contacts);
             virtual void setCanSupplyDescription(bool allowed);
             virtual void setWarning(const boost::optional<std::string>& message);
 
         protected:
             virtual int nextId() const;
 
         private slots:
             void handleFirstPageRadioChange();
             virtual void handleCurrentChanged(int);
             virtual void handleAccepted();
             void handleContactSuggestionRequested(const QString& text);
             void addContact();
             void handleAddViaSearch();
             void handleListChanged(std::vector<Contact::ref> list);
             void handleJIDsAdded(std::vector<JID> jids);
             void handleJIDEditingDone();
 
         private:
             void setFirstPage(QString title = "");
             void setSecondPage();
             void setThirdPage();
 
         private:
             void clearForm();
             void setError(const QString& error);
             JID getServerToSearch();
             void handleSearch();
             JID getContactJID() const;
             Contact::ref getContact() const;
             void addSearchedJIDToList(const Contact::ref& contact);
             void handleOnSearchedJIDSelected(const Contact::ref& contact);
 
         private:
             UIEventStream* eventStream_;
             UserSearchWindow::Type type_;
             QAbstractItemModel* model_;
             UserSearchDelegate* delegate_;
             QtUserSearchFirstPage* firstPage_;
             QtUserSearchFirstMultiJIDPage* firstMultiJIDPage_;
             QtUserSearchFieldsPage* fieldsPage_;
             QtUserSearchResultsPage* resultsPage_;
             QtUserSearchDetailsPage* detailsPage_;
             JID myServer_;
             JID roomJID_;
+            JID originatorJID_;
             int lastPage_;
             std::vector<Contact::ref> contactVector_;
             SettingsProvider* settings_;
             bool searchNext_;
             bool supportsImpromptu_;
     };
 }