Tox:

- tox id is key again
- reworked tox profile logic


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

1 files changed, 4 insertions, 3 deletions

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 608f439365..bef938599b 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -126,11 +126,12 @@ private:
 	// tox profile

 	HANDLE hProfile;

 	std::tstring GetToxProfilePath();

+	static std::tstring CToxProto::GetToxProfilePath(const TCHAR *accountName);

 

 	void LoadToxProfile();

 	void SaveToxProfile();

 

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

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

 

 	// accounts

 	static LIST<CToxProto> accounts;

@@ -222,8 +223,8 @@ private:
 	TOX_USERSTATUS MirandaToToxStatus(int status);

 	int ToxToMirandaStatus(TOX_USERSTATUS userstatus);

 

-	static void ShowNotification(const wchar_t *message, int flags = 0, MCONTACT hContact = NULL);

-	static void ShowNotification(const wchar_t *caption, const wchar_t *message, int flags = 0, MCONTACT hContact = NULL);

+	static void ShowNotification(const TCHAR *message, int flags = 0, MCONTACT hContact = NULL);

+	static void ShowNotification(const TCHAR *caption, const TCHAR *message, int flags = 0, MCONTACT hContact = NULL);

 

 	HANDLE AddDbEvent(MCONTACT hContact, WORD type, DWORD timestamp, DWORD flags, DWORD cbBlob, PBYTE pBlob);