Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-12-26 18:16:30 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-12-26 18:16:30 (GMT) |
| commit | 49d621c38effcdcc9aaafd3ee14082a2ae8278c4 (patch) | |
| tree | 1140379b7a6357e2d197f09235b79f76db9d8e0b /Swift/Controllers/Chat/UserSearchController.h | |
| parent | a8c4b779ad2795f76769f7dae2749ef869300bee (diff) | |
| download | swift-49d621c38effcdcc9aaafd3ee14082a2ae8278c4.zip swift-49d621c38effcdcc9aaafd3ee14082a2ae8278c4.tar.bz2 | |
Fixed crash when searching for users.
Resolves: #730
Diffstat (limited to 'Swift/Controllers/Chat/UserSearchController.h')
| -rw-r--r-- | Swift/Controllers/Chat/UserSearchController.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Swift/Controllers/Chat/UserSearchController.h b/Swift/Controllers/Chat/UserSearchController.h index c54b8d5..9b81020 100644 --- a/Swift/Controllers/Chat/UserSearchController.h +++ b/Swift/Controllers/Chat/UserSearchController.h @@ -41,21 +41,24 @@ namespace Swift { enum Type {AddContact, StartChat}; UserSearchController(Type type, const JID& jid, UIEventStream* uiEventStream, UserSearchWindowFactory* userSearchWindowFactory, IQRouter* iqRouter); ~UserSearchController(); + private: void handleUIEvent(boost::shared_ptr<UIEvent> event); void handleFormRequested(const JID& service); - void handleDiscoServiceFound(const JID& jid, boost::shared_ptr<DiscoInfo> info, DiscoServiceWalker* walker); - void handleDiscoWalkFinished(DiscoServiceWalker* walker); - void handleFormResponse(boost::shared_ptr<SearchPayload> items, ErrorPayload::ref error, const JID& jid); + void handleDiscoServiceFound(const JID& jid, boost::shared_ptr<DiscoInfo> info); + void handleDiscoWalkFinished(); + void handleFormResponse(boost::shared_ptr<SearchPayload> items, ErrorPayload::ref error); void handleSearch(boost::shared_ptr<SearchPayload> fields, const JID& jid); - void handleSearchResponse(boost::shared_ptr<SearchPayload> results, ErrorPayload::ref error, const JID& jid); + void handleSearchResponse(boost::shared_ptr<SearchPayload> results, ErrorPayload::ref error); + void endDiscoWalker(); + + private: Type type_; + JID jid_; UIEventStream* uiEventStream_; - UserSearchWindow* window_; UserSearchWindowFactory* factory_; - boost::bsignals::scoped_connection uiEventConnection_; IQRouter* iqRouter_; - JID jid_; + UserSearchWindow* window_; DiscoServiceWalker* discoWalker_; }; } |