old junk removed from core

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

2 files changed, 2 insertions, 36 deletions

diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index 304c52b188..9bfeda6d70 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -754,6 +754,8 @@ Copies the EVENTTYPE_AUTHREQUEST event from PROTORECVEVENT into DBEVENTINFO and
   lParam = PROTORECVEVENT*

 Returns the result of MS_DB_EVENT_ADD

 */

+#define PSR_AUTH		"/RecvAuth"

+

 #define MS_PROTO_AUTHRECV  "Proto/AuthRecv"

 

 __forceinline INT_PTR Proto_AuthRecv(const char *szProtoName, PROTORECVEVENT *pcre)

@@ -820,14 +822,6 @@ Use PS_ADDTOLISTBYEVENT to add the contacts from one of these to the list.
 //lParam = (LPARAM)(PROTORECVEVENT*)&pre

 #define PSR_AWAYMSG    "/RecvAwayMsg"

 

-//An authorization request has been received

-//wParam = 0

-//lParam = (LPARAM)(PROTORECVEVENT*)&pre

-//pre.szMessage is same format as blob

-//pre.lParam is the size of the blob

-#define PSR_AUTH		"/RecvAuth"

-

-

 #ifdef _UNICODE

 

 #define PS_SETAWAYMSGT    PS_SETAWAYMSGW

diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp
index a7088ac378..228c04c9d6 100644
--- a/src/core/stdfile/file.cpp
+++ b/src/core/stdfile/file.cpp
@@ -387,33 +387,6 @@ static void sttRecvCreateBlob(DBEVENTINFO& dbei, int fileCount, char** pszFiles,
 	strcpy((char*)p, (szDescr == NULL) ? "" : szDescr);

 }

 

-static INT_PTR Proto_RecvFile(WPARAM, LPARAM lParam)

-{

-	CCSDATA* ccs = (CCSDATA*)lParam;

-	PROTORECVEVENT* pre = (PROTORECVEVENT*)ccs->lParam;

-	char* szFile = pre->szMessage + sizeof(DWORD);

-	char* szDescr = szFile + strlen(szFile) + 1;

-

-	// Suppress the standard event filter

-	if (pre->lParam != NULL)

-		*(DWORD*)pre->szMessage = 0;

-

-	DBEVENTINFO dbei = { 0 };

-	dbei.cbSize = sizeof(dbei);

-	dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);

-	dbei.timestamp = pre->timestamp;

-	dbei.flags = (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0;

-	dbei.flags |= (pre->flags & PREF_UTF) ? DBEF_UTF : 0;

-	dbei.eventType = EVENTTYPE_FILE;

-	dbei.cbBlob = (DWORD)(sizeof(DWORD) + strlen(szFile) + strlen(szDescr) + 2);

-	dbei.pBlob = (PBYTE)pre->szMessage;

-	HANDLE hdbe = (HANDLE)CallService(MS_DB_EVENT_ADD, (WPARAM)ccs->hContact, (LPARAM)&dbei);

-

-	if (pre->lParam != NULL)

-		PushFileEvent(ccs->hContact, hdbe, pre->lParam);

-	return 0;

-}

-

 static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam)

 {

 	CCSDATA* ccs = (CCSDATA*)lParam;

@@ -467,7 +440,6 @@ int LoadSendRecvFileModule(void)
 	HookEvent(ME_OPT_INITIALISE, FileOptInitialise);

 	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, SRFilePreBuildMenu);

 

-	CreateServiceFunction(MS_PROTO_RECVFILET, Proto_RecvFile);

 	CreateServiceFunction(MS_PROTO_RECVFILET, Proto_RecvFileT);

 

 	CreateServiceFunction(MS_FILE_SENDFILE, SendFileCommand);