- 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

6 files changed, 13 insertions, 13 deletions

diff --git a/src/core/stdauth/src/authdialogs.cpp b/src/core/stdauth/src/authdialogs.cpp
index d1b1e3833d..5de5cb0cf3 100644
--- a/src/core/stdauth/src/authdialogs.cpp
+++ b/src/core/stdauth/src/authdialogs.cpp
@@ -266,9 +266,9 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_DENYREASON))) {

 					TCHAR szReason[256];

 					GetDlgItemText(hwndDlg, IDC_DENYREASON, szReason, SIZEOF(szReason));

-					CallProtoService(dbei.szModule, PS_AUTHDENYT, (WPARAM)hDbEvent, (LPARAM)szReason);

+					CallProtoService(dbei.szModule, PS_AUTHDENY, (WPARAM)hDbEvent, (LPARAM)szReason);

 				}

-				else CallProtoService(dbei.szModule, PS_AUTHDENYT, (WPARAM)hDbEvent, 0);

+				else CallProtoService(dbei.szModule, PS_AUTHDENY, (WPARAM)hDbEvent, 0);

 			}

 			DestroyWindow(hwndDlg);

 			break;

diff --git a/src/core/stdautoaway/src/autoaway.cpp b/src/core/stdautoaway/src/autoaway.cpp
index a619c831c1..f501ec2bda 100644
--- a/src/core/stdautoaway/src/autoaway.cpp
+++ b/src/core/stdautoaway/src/autoaway.cpp
@@ -49,7 +49,7 @@ static void Proto_SetStatus(const char* szProto, unsigned status)
 {

 	if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) {

 		TCHAR *awayMsg = (TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGW, status, (LPARAM)szProto);

-		CallProtoService(szProto, PS_SETAWAYMSGT, status, (LPARAM)awayMsg);

+		CallProtoService(szProto, PS_SETAWAYMSG, status, (LPARAM)awayMsg);

 		mir_free(awayMsg);

 	}

 

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index a86f79f917..4b36e6aa15 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -194,10 +194,10 @@ void ChangeAllProtoMessages(char *szProto, int statusMode, TCHAR *msg)
 				continue;

 

 			if ((CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) && !Proto_IsAccountLocked(pa))

-				CallProtoService(pa->szModuleName, PS_SETAWAYMSGT, statusMode, (LPARAM)msg);

+				CallProtoService(pa->szModuleName, PS_SETAWAYMSG, statusMode, (LPARAM)msg);

 		}

 	}

-	else CallProtoService(szProto, PS_SETAWAYMSGT, statusMode, (LPARAM)msg);

+	else CallProtoService(szProto, PS_SETAWAYMSG, statusMode, (LPARAM)msg);

 }

 

 struct SetAwayMsgData

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 0b263cf47b..d867dc18f3 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -392,13 +392,13 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam)
 	if (bUnicode) {

 		pszFiles = (char**)alloca(pre->fileCount * sizeof(char*));

 		for (int i = 0; i < pre->fileCount; i++)

-			pszFiles[i] = Utf8EncodeT(pre->ptszFiles[i]);

+			pszFiles[i] = Utf8EncodeT(pre->files.t[i]);

 		

-		szDescr = Utf8EncodeT(pre->tszDescription);

+		szDescr = Utf8EncodeT(pre->descr.t);

 	}

 	else {

-		pszFiles = pre->pszFiles;

-		szDescr = pre->szDescription;

+		pszFiles = pre->files.a;

+		szDescr = pre->descr.a;

 	}

 

 	dbei.cbBlob = sizeof(DWORD);

diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index ccfaa427e2..d49fd5f3db 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -376,7 +376,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			break;

 

 		case IDCANCEL:

-			if (dat->fs) CallContactService(dat->hContact, PSS_FILEDENYT, (WPARAM)dat->fs, (LPARAM)TranslateT("Canceled"));

+			if (dat->fs) CallContactService(dat->hContact, PSS_FILEDENY, (WPARAM)dat->fs, (LPARAM)TranslateT("Canceled"));

 			dat->fs = NULL; /* the protocol will free the handle */

 			DestroyWindow(hwndDlg);

 			break;

diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index 507c63ca19..15bfe94d41 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -236,7 +236,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		if (dat->send) {
 			if (db_mc_isMeta(dat->hContact))
 				dat->hContact = db_mc_getMostOnline(dat->hContact);
-			dat->fs = (HANDLE)CallContactService(dat->hContact, PSS_FILET, (WPARAM)dat->szMsg, (LPARAM)dat->files);
+			dat->fs = (HANDLE)CallContactService(dat->hContact, PSS_FILE, (WPARAM)dat->szMsg, (LPARAM)dat->files);
 			SetFtStatus(hwndDlg, LPGENT("Request sent, waiting for acceptance..."), FTS_TEXT);
 			SetOpenFileButtonStyle(GetDlgItem(hwndDlg, IDC_OPENFILE), 1);
 			dat->waitingForAcceptance = 1;
@@ -246,7 +246,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		}
 		else {	//recv
 			CreateDirectoryTreeT(dat->szSavePath);
-			dat->fs = (HANDLE)CallContactService(dat->hContact, PSS_FILEALLOWT, (WPARAM)dat->fs, (LPARAM)dat->szSavePath);
+			dat->fs = (HANDLE)CallContactService(dat->hContact, PSS_FILEALLOW, (WPARAM)dat->fs, (LPARAM)dat->szSavePath);
 			dat->transferStatus.tszWorkingDir = mir_tstrdup(dat->szSavePath);
 			if (db_get_b(dat->hContact, "CList", "NotOnList", 0)) dat->resumeBehaviour = FILERESUME_ASK;
 			else dat->resumeBehaviour = db_get_b(NULL, "SRFile", "IfExists", FILERESUME_ASK);
@@ -491,7 +491,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				break;
 			}
 			mir_free(szOriginalFilename);
-			CallProtoService(szProto, PS_FILERESUMET, (WPARAM)dat->fs, (LPARAM)pfr);
+			CallProtoService(szProto, PS_FILERESUME, (WPARAM)dat->fs, (LPARAM)pfr);
 			if (pfr->szFilename) mir_free((char*)pfr->szFilename);
 			mir_free(pfr);
 		}