- fixed contact search async loading

- added search by email

git-svn-id: http://svn.miranda-ng.org/main/trunk@2008 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 15 insertions, 6 deletions

diff --git a/protocols/Skype/src/skype_subclassing.h b/protocols/Skype/src/skype_subclassing.h
index a8f87a6e50..a4da27ccbd 100644
--- a/protocols/Skype/src/skype_subclassing.h
+++ b/protocols/Skype/src/skype_subclassing.h
@@ -41,22 +41,30 @@ private:
 class CContactSearch : public ContactSearch
 {
 public:
+	typedef void (CSkypeProto::* OnSearchCompleted)(HANDLE hSearch);
+	typedef void (CSkypeProto::* OnContactFinded)(HANDLE hSearch, CContact::Ref contact);
+
 	typedef DRef<CContactSearch, ContactSearch> Ref;
 	typedef DRefs<CContactSearch, ContactSearch> Refs;
-
-	bool isSeachFailed;
+	
 	bool isSeachFinished;
+	bool isSeachFailed;
 
 	CContactSearch(unsigned int oid, SERootObject* root);
 
-	//void set_controller(CommandContactSearch* controller) { m_controller = controller; }
-
 	void OnChange(int prop);
 	void OnNewResult(const ContactRef& contact, const uint& rankValue);
 
-	void BlockWhileSearching();
+	void SetProtoInfo(CSkypeProto* proto, HANDLE hSearch);
+	void SetOnSearchCompleatedCallback(OnSearchCompleted callback);
+	void SetOnContactFindedCallback(OnContactFinded callback);
 
-	//CommandContactSearch* m_controller;
+	void BlockWhileSearch();
+private:

+	HANDLE hSearch;

+	CSkypeProto* proto;

+	OnSearchCompleted SearchCompletedCallback;
+	OnContactFinded ContactFindedCallback;
 };

 

 class CContactGroup : public ContactGroup

@@ -106,5 +114,6 @@ public:
 	CAccount*		newAccount(int oid);

 	CContactGroup*	newContactGroup(int oid);

 	CConversation*	newConversation(int oid);

+	CContactSearch*	newContactSearch(int oid);

 	CContact*		newContact(int oid);

 };
\ No newline at end of file