diff options
author | Tobias Markmann <tm@ayena.de> | 2014-10-29 14:02:39 (GMT) |
---|---|---|
committer | Swift Review <review@swift.im> | 2014-10-30 15:41:49 (GMT) |
commit | 5cf50d46aed4d2dac333e5e3b3bc2f57f7a1b835 (patch) | |
tree | 554e93a52e5c41e98b9e42e5d958819b87439b88 /Swift/QtUI/UserSearch/QtUserSearchWindow.h | |
parent | 4041cc4dd4f0abc6641fed5890120efa691a27ca (diff) | |
download | swift-5cf50d46aed4d2dac333e5e3b3bc2f57f7a1b835.zip swift-5cf50d46aed4d2dac333e5e3b3bc2f57f7a1b835.tar.bz2 |
Prevent user from adding contacts twice to a roster.
This removes roster JIDs from the suggesting in the 'Add User'-dialog. In
addition, an indication is added when a manually entered JID is invalid or
already on the roster.
Test-Information:
Tested scenarios with recent JIDs and JIDs from the roster. Tested that 'Start
Chat'-dialog suggestions still work.
Change-Id: I1ff51637adb4224184b78a1af9090a04b1e18fff
Diffstat (limited to 'Swift/QtUI/UserSearch/QtUserSearchWindow.h')
-rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchWindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h index 255b8fe..d1d29f2 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h @@ -52,6 +52,7 @@ namespace Swift { 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; @@ -65,6 +66,7 @@ namespace Swift { void handleAddViaSearch(); void handleListChanged(std::vector<Contact::ref> list); void handleJIDsAdded(std::vector<JID> jids); + void handleJIDEditingDone(); private: void setFirstPage(QString title = ""); |