SkypeClassic:

Upmerge with leecher's repo:
-Implemented Filetransfer extensions for receiving files and avatars via SkypeProxy (sending via SkypeProxy not working yet).
-Added option to disable the check for SENT messages as newer Skype versions don't send this notification anymore.
-Various little code fixes.

Other changes:
- Fixed memory leak
- Fixed crash in x64 builds
- Translation fixes

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

1 files changed, 2 insertions, 6 deletions

diff --git a/protocols/SkypeClassic/src/skypeapi.h b/protocols/SkypeClassic/src/skypeapi.h
index 3d1c00eb01..d5a8053a8f 100644
--- a/protocols/SkypeClassic/src/skypeapi.h
+++ b/protocols/SkypeClassic/src/skypeapi.h
@@ -44,7 +44,7 @@ int CloseSkypeAPI(char *skypePath);
 INT_PTR SkypeAdduserDlg(WPARAM wParam, LPARAM lParam);

 INT_PTR SkypeAnswerCall(WPARAM wParam, LPARAM lParam);

 int SkypeMsgCollectGarbage(time_t age);

-INT_PTR SkypeSendFile(WPARAM wParam, LPARAM lParam);

+INT_PTR SkypeSendGuiFile(WPARAM wParam, LPARAM);

 INT_PTR SkypeBlockContact(WPARAM wParam, LPARAM lParam);

 INT_PTR SkypeSetAvatar(WPARAM wParam, LPARAM lParam);

 INT_PTR SkypeSetAwayMessage(WPARAM wParam, LPARAM lParam);

@@ -55,15 +55,11 @@ int SkypeSetProfile(char *szProperty, char *szValue);
 char *SkypeGet(char *szWhat, char *szWho, char *szProperty);

 char *SkypeGetID(char *szWhat, char *szWho, char *szProperty);

 char *SkypeGetErr(char *szWhat, char *szWho, char *szProperty);

-#ifdef _UNICODE

+char *SkypeGetErrID(char *szWhat, char *szWho, char *szProperty);

 WCHAR *SkypeGetW(char *szWhat, WCHAR *szWho, char *szProperty);

 WCHAR *SkypeGetErrW(char *szWhat, TCHAR *szWho, char *szProperty);

 #define SkypeGetT SkypeGetW

 #define SkypeGetErrT SkypeGetErrW

-#else

-#define SkypeGetT SkypeGet

-#define SkypeGetErrT SkypeGetErr

-#endif

 char *SkypeGetProfile(char *szProperty);

 void SetUserNamePassword();

 INT_PTR SkypeAdduserDlg(WPARAM wParam, LPARAM lParam);