summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-07-24 08:18:49 (GMT)
committerTobias Markmann <tm@ayena.de>2014-10-10 09:53:29 (GMT)
commitc7cd9c8d239c1c5d604de8862625741754138771 (patch)
tree06c6915ce14f84ae63f50f564a5b6021acf5c0a3
parent8921c929a190c3ae4d7a10e5e58c8e720a0121c3 (diff)
downloadswift-c7cd9c8d239c1c5d604de8862625741754138771.zip
swift-c7cd9c8d239c1c5d604de8862625741754138771.tar.bz2
Fix JID auto-complete item select not working when adding a contact.
Test-Information: Confirm that clicking a suggested user fills the JID box on the "Add User" dialog. Confirm that JID suggestion functions normally in other places. Change-Id: Ic1a5c30b95416fd46bc22a612793621e9501d770
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchWindow.cpp5
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchWindow.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index e5bd5d0..29ee306 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -281,6 +281,10 @@ void QtUserSearchWindow::addSearchedJIDToList(const Contact::ref& contact) {
firstMultiJIDPage_->jid_->clear();
}
+void QtUserSearchWindow::handleOnSearchedJIDSelected(const Contact::ref& contact) {
+ firstPage_->jid_->setText(P2QSTRING(contact->jid.toString()));
+}
+
void QtUserSearchWindow::show() {
clear();
QWidget::show();
@@ -468,6 +472,7 @@ void QtUserSearchWindow::setFirstPage(QString title) {
if (type_ == AddContact) {
firstPage_ = new QtUserSearchFirstPage(type_, title.isEmpty() ? firstPage_->title() : title, settings_);
connect(firstPage_->jid_, SIGNAL(textEdited(QString)), this, SLOT(handleContactSuggestionRequested(QString)));
+ firstPage_->jid_->onUserSelected.connect(boost::bind(&QtUserSearchWindow::handleOnSearchedJIDSelected, this, _1));
connect(firstPage_->byJID_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
connect(firstPage_->byLocalSearch_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
connect(firstPage_->byRemoteSearch_, SIGNAL(toggled(bool)), this, SLOT(handleFirstPageRadioChange()));
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index 0318b3d..255b8fe 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -79,6 +79,7 @@ namespace Swift {
JID getContactJID() const;
Contact::ref getContact() const;
void addSearchedJIDToList(const Contact::ref& contact);
+ void handleOnSearchedJIDSelected(const Contact::ref& contact);
private:
UIEventStream* eventStream_;