Tox: work commit

- multimedia dialogs are reworked
- some fixes

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

1 files changed, 7 insertions, 6 deletions

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 2f15e16477..946dcb9039 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -6,9 +6,10 @@ struct CToxProto : public PROTO<CToxProto>
 	friend CToxPasswordEditor;

 	friend CToxOptionsMain;

 	friend CToxOptionsNodeList;

-	friend CToxAudioCall;

-	friend CToxIncomingAudioCall;

-	friend CToxOutgoingAudioCall;

+	friend CToxCallDlgBase;

+	friend CToxIncomingCall;

+	friend CToxOutgoingCall;

+	friend CToxCallDialog;

 

 public:

 	//////////////////////////////////////////////////////////////////////////////////////

@@ -153,7 +154,7 @@ private:
 	MCONTACT GetContact(const int friendNumber);

 	MCONTACT GetContact(const char *pubKey);

 

-	MCONTACT AddContact(const char *address, const std::tstring &dnsId, bool isTemporary = false);

+	MCONTACT AddContact(const char *address, const TCHAR *dnsId = NULL, bool isTemporary = false);

 

 	MCONTACT GetContactFromAuthEvent(MEVENT hEvent);

 

@@ -173,8 +174,8 @@ private:
 	static void OnConnectionStatusChanged(Tox *tox, uint32_t friendNumber, TOX_CONNECTION status, void *arg);

 

 	// contacts search

-	void __cdecl SearchByNameAsync(void* arg);

-	void __cdecl SearchFailedAsync(void* arg);

+	void __cdecl SearchByNameAsync(void *arg);

+	void __cdecl SearchFailedAsync(void *arg);

 

 	static INT_PTR CALLBACK SearchDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);