- PROTOCOLDESCRIPTOR_V3_SIZE to identify an ANSI plugin;

- absence of fnInitFunc to identify a protocol without instances;
- whole bunch of ansi crutches discarded

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

4 files changed, 7 insertions, 22 deletions

diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 411fdbb0a4..809b3803a3 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -2070,8 +2070,8 @@ LRESULT APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam)
 							*ptr = ' ';

 						}

 						else if (strncmp(ptr, " CHATMESSAGES ", 14) == 0) {

-							int iLen=mir_strlen(ptr+14)+1;

-							char *pParam=(char*)calloc(iLen+1, 1);

+							size_t iLen = mir_strlen(ptr+14)+1;

+							char *pParam = (char*)calloc(iLen+1, 1);

 							*pParam=TRUE;

 							memcpy(pParam+1, ptr+14, iLen);

 							pthread_create((pThreadFunc)MessageListProcessingThread, pParam);

@@ -2127,7 +2127,6 @@ LRESULT APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam)
 			}

 			if (!strncmp(szSkypeMsg, "MESSAGES", 8) || !strncmp(szSkypeMsg, "CHATMESSAGES", 12)) {

 				char *pMsgs;

-				int iLen;

 				if (mir_strlen(szSkypeMsg) <= (UINT)((pMsgs=strchr(szSkypeMsg, ' ')) - szSkypeMsg + 1))

 				{

 					LOG(("%s %d %s %d", szSkypeMsg, (UINT)(strchr(szSkypeMsg, ' ') - szSkypeMsg + 1),

@@ -2135,7 +2134,8 @@ LRESULT APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam)
 					break;

 				}

 				LOG(("MessageListProcessingThread launched"));

-				char *pParam=(char*)calloc((iLen=mir_strlen(pMsgs)+1)+1, 1);

+				size_t iLen = mir_strlen(pMsgs)+1;

+				char *pParam=(char*)calloc(iLen+1, 1);

 				memcpy(pParam+1, pMsgs, iLen);

 				pthread_create((pThreadFunc)MessageListProcessingThread, pParam);

 				break;

diff --git a/protocols/SkypeClassic/src/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp
index ad6bc71967..73bf8d50b3 100644
--- a/protocols/SkypeClassic/src/skypeapi.cpp
+++ b/protocols/SkypeClassic/src/skypeapi.cpp
@@ -1100,21 +1100,8 @@ INT_PTR SkypeSetNick(WPARAM wParam, LPARAM lParam) {
  * Returns: 0 - Success

  *		   -1 - Failure

  */

-INT_PTR SkypeSetAwayMessage(WPARAM wParam, LPARAM lParam) {

-	int retval = -1;

-	char *Mood = NULL;

-	

-	if (!lParam) lParam=(LPARAM)"";

-	if(utf8_encode((const char *)lParam, &Mood) == -1 ) return -1;

-	db_set_s(NULL, SKYPE_PROTONAME, "MoodText", (const char *)lParam);

-	 

-	if(AttachStatus == SKYPECONTROLAPI_ATTACH_SUCCESS)

-		retval = SkypeSend("SET PROFILE MOOD_TEXT %s", Mood);

-	free (Mood);

 

-	return retval;

-}

-INT_PTR SkypeSetAwayMessageW(WPARAM wParam, LPARAM lParam) {

+INT_PTR SkypeSetAwayMessage(WPARAM wParam, LPARAM lParam) {

 	int retval = -1;

 	char *Mood = NULL;

 	

diff --git a/protocols/SkypeClassic/src/skypeapi.h b/protocols/SkypeClassic/src/skypeapi.h
index 120b7fb462..63bf26e425 100644
--- a/protocols/SkypeClassic/src/skypeapi.h
+++ b/protocols/SkypeClassic/src/skypeapi.h
@@ -44,7 +44,6 @@ 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);

-INT_PTR SkypeSetAwayMessageW(WPARAM wParam, LPARAM lParam);

 INT_PTR SkypeSetNick(WPARAM wParam, LPARAM lParam);

 INT_PTR SkypeChatCreate(WPARAM wParam, LPARAM lParam);

 int SkypeSetProfile(char *szProperty, char *szValue);

diff --git a/protocols/SkypeClassic/src/skypesvc.cpp b/protocols/SkypeClassic/src/skypesvc.cpp
index fae8b8cd3b..1d1d2821bf 100644
--- a/protocols/SkypeClassic/src/skypesvc.cpp
+++ b/protocols/SkypeClassic/src/skypesvc.cpp
@@ -68,10 +68,10 @@ void CreateServices(void)
 	CreateProtoService(PS_AUTHDENY, SkypeAuthDeny);

 	CreateProtoService(PSR_FILE, SkypeRecvFile);

 

-	CreateProtoService(PSS_FILEALLOWT, SkypeFileAllow);

+	CreateProtoService(PSS_FILEALLOW, SkypeFileAllow);

 	CreateProtoService(PSS_FILEDENY, SkypeFileCancel);

 	CreateProtoService(PSS_FILECANCEL, SkypeFileCancel);

-	CreateProtoService(PSS_FILET, SkypeSendFile);

+	CreateProtoService(PSS_FILE, SkypeSendFile);

 

 	CreateProtoService(PS_GETAVATARINFO, SkypeGetAvatarInfo);

 	CreateProtoService(PS_GETAVATARCAPS, SkypeGetAvatarCaps);

@@ -79,7 +79,6 @@ void CreateServices(void)
 	CreateProtoService(PS_SETMYAVATAR, SkypeSetAvatar);

 

 	CreateProtoService(PS_SETAWAYMSG, SkypeSetAwayMessage);

-	CreateProtoService(PS_SETAWAYMSGW, SkypeSetAwayMessageW);

 	CreateProtoService(PSS_GETAWAYMSG, SkypeGetAwayMessage);

 	CreateProtoService(PS_SETMYNICKNAME, SkypeSetNick);