Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-11-18 12:09:08 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-12-22 20:19:07 (GMT) |
| commit | 9f04a7ec3429303118f12607703b877d8ba43888 (patch) | |
| tree | 3e868395fa3c4f9cbbf84614094bb0251b425c15 /Swiften | |
| parent | 04b99ce8430109d0467c29c85cb6bacb85c54c44 (diff) | |
| download | swift-contrib-9f04a7ec3429303118f12607703b877d8ba43888.zip swift-contrib-9f04a7ec3429303118f12607703b877d8ba43888.tar.bz2 | |
Basic User Search support, and Find Rooms cleanup.
Adds a throbber to the MUC search, turns the Add Contact dialog into something searchy, adds the option to open chats to arbitrary JIDs.
Resolves: #614
Resolves: #695
Resolves: #436
Release-Notes: On servers that support it, users can now perform searches for contacts to add or chat to.
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Elements/DiscoInfo.cpp | 1 | ||||
| -rw-r--r-- | Swiften/Elements/DiscoInfo.h | 1 | ||||
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Swiften/Elements/DiscoInfo.cpp b/Swiften/Elements/DiscoInfo.cpp index 276b341..a939d48 100644 --- a/Swiften/Elements/DiscoInfo.cpp +++ b/Swiften/Elements/DiscoInfo.cpp @@ -10,6 +10,7 @@ namespace Swift { const String DiscoInfo::ChatStatesFeature = String("http://jabber.org/protocol/chatstates"); const String DiscoInfo::SecurityLabelsFeature = String("urn:xmpp:sec-label:0"); +const String DiscoInfo::JabberSearchFeature = String("jabber:iq:search"); bool DiscoInfo::Identity::operator<(const Identity& other) const { diff --git a/Swiften/Elements/DiscoInfo.h b/Swiften/Elements/DiscoInfo.h index 038a2f1..41bf6bf 100644 --- a/Swiften/Elements/DiscoInfo.h +++ b/Swiften/Elements/DiscoInfo.h @@ -21,6 +21,7 @@ namespace Swift { static const String ChatStatesFeature; static const String SecurityLabelsFeature; + static const String JabberSearchFeature; const static std::string SecurityLabels; class Identity { diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp index f57411b..1bbcbf2 100644 --- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp +++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp @@ -39,6 +39,7 @@ #include "Swiften/Serializer/PayloadSerializers/CommandSerializer.h" #include "Swiften/Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.h" #include "Swiften/Serializer/PayloadSerializers/NicknameSerializer.h" +#include "Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h" namespace Swift { @@ -75,6 +76,7 @@ FullPayloadSerializerCollection::FullPayloadSerializerCollection() { serializers_.push_back(new CommandSerializer()); serializers_.push_back(new InBandRegistrationPayloadSerializer()); serializers_.push_back(new NicknameSerializer()); + serializers_.push_back(new SearchPayloadSerializer()); foreach(PayloadSerializer* serializer, serializers_) { addSerializer(serializer); } |