ProtoBroadcastAck - unified helper for all protocols

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

4 files changed, 30 insertions, 30 deletions

diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp
index 1a89631748..d195d04ad2 100644
--- a/protocols/Gadu-Gadu/src/avatar.cpp
+++ b/protocols/Gadu-Gadu/src/avatar.cpp
@@ -231,12 +231,12 @@ void __cdecl GGPROTO::avatarrequestthread(void*)
 				pai.hContact = hContact;

 				INT_PTR res = getavatarinfo((WPARAM)GAIF_FORCE, (LPARAM)&pai);

 				if (res == GAIR_NOAVATAR){

-					ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, NULL, 0);

+					ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, NULL, 0);

 				} else if (res == GAIR_SUCCESS) {

-					ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&pai, 0);

+					ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&pai, 0);

 				} //if GAIR_WAITFOR -> ignore

 			} else {

-				ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, 0, 0);

+				ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, 0, 0);

 			}

 		} else {

 			gg_LeaveCriticalSection(&avatar_mutex, "avatarrequestthread", 3, 2, "avatar_mutex", 1);

@@ -300,7 +300,7 @@ void __cdecl GGPROTO::avatarrequestthread(void*)
 			}

 			else netlog("avatarrequestthread(): No response from HTTP request");

 

-			ProtoBroadcastAck(m_szModuleName, pai.hContact, ACKTYPE_AVATAR,

+			ProtoBroadcastAck(pai.hContact, ACKTYPE_AVATAR,

 				result ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, (HANDLE)&pai, 0);

 

 			if (!pai.hContact)

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 4e307e6566..b8835c9596 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -560,7 +560,7 @@ retry:
 			case GG_EVENT_ACK:

 				if (e->event.ack.seq && e->event.ack.recipient)

 				{

-					ProtoBroadcastAck(m_szModuleName, getcontact((DWORD)e->event.ack.recipient, 0, 0, NULL),

+					ProtoBroadcastAck(getcontact((DWORD)e->event.ack.recipient, 0, 0, NULL),

 						ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE) e->event.ack.seq, 0);

 				}

 				break;

@@ -677,7 +677,7 @@ retry:
 							sr.email = strFmt2;

 							sr.id = _ultot(uin, strFmt1, 10);

 							sr.uin = uin;

-							ProtoBroadcastAck(m_szModuleName, NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE) 1, (LPARAM)&sr);

+							ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE) 1, (LPARAM)&sr);

 						}

 

 						if (((res->seq == GG_SEQ_INFO || res->seq == GG_SEQ_GETNICK) && hContact != NULL)

@@ -755,7 +755,7 @@ retry:
 							}

 

 							netlog("mainthread() (%x): Setting user info for uin %d.", this, uin);

-							ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE) 1, 0);

+							ProtoBroadcastAck(hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE) 1, 0);

 						}

 

 						if (__nickname) mir_free(__nickname);

@@ -768,7 +768,7 @@ retry:
 					}

 				}

 				if (res->seq == GG_SEQ_SEARCH)

-					ProtoBroadcastAck(m_szModuleName, NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE) 1, 0);

+					ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE) 1, 0);

 				break;

 			}

 

@@ -1101,7 +1101,7 @@ retry:
 					if (dcc7->type == GG_SESSION_DCC7_SEND)

 					{

 						netlog("mainthread() (%x): File transfer denied by client %d (reason = %d).", this, dcc7->peer_uin, e->event.dcc7_reject.reason);

-						ProtoBroadcastAck(m_szModuleName, dcc7->contact, ACKTYPE_FILE, ACKRESULT_DENIED, dcc7, 0);

+						ProtoBroadcastAck(dcc7->contact, ACKTYPE_FILE, ACKRESULT_DENIED, dcc7, 0);

 

 						// Remove from watches and free

 						gg_EnterCriticalSection(&ft_mutex, "mainthread", 21, "ft_mutex", 1);

@@ -1162,7 +1162,7 @@ retry:
 					}

 

 					if (dcc7->contact)

-						ProtoBroadcastAck(m_szModuleName, dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc7, 0);

+						ProtoBroadcastAck(dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc7, 0);

 

 					// Free dcc

 					gg_dcc7_free(dcc7);

@@ -1286,7 +1286,7 @@ void GGPROTO::broadcastnewstatus(int newStatus)
 	m_iStatus = newStatus;

 	gg_LeaveCriticalSection(&modemsg_mutex, "broadcastnewstatus", 24, 2, "modemsg_mutex", 1);

 

-	ProtoBroadcastAck(m_szModuleName, NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE) oldStatus, newStatus);

+	ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE) oldStatus, newStatus);

 

 	netlog("broadcastnewstatus(): Broadcast new status: %d.", newStatus);

 }

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index f5436008a9..345537d9be 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -98,7 +98,7 @@ void __cdecl GGPROTO::ftfailthread(void *param)
 	struct ftfaildata *ft = (struct ftfaildata *)param;

 	netlog("ftfailthread(): started. Sending failed file transfer.");

 	gg_sleep(100, FALSE, "ftfailthread", 102, 1);

-	ProtoBroadcastAck(m_szModuleName, ft->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, ft->hProcess, 0);

+	ProtoBroadcastAck(ft->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, ft->hProcess, 0);

 	free(ft);

 	netlog("ftfailthread(): end.");

 }

@@ -286,7 +286,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 								pfts.currentFileProgress = local_dcc->offset;

 								pfts.currentFileTime = 0;

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 3, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc, (LPARAM)&pfts);

+								ProtoBroadcastAck(local_dcc->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc, (LPARAM)&pfts);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 							}

 							break;

@@ -317,11 +317,11 @@ void __cdecl GGPROTO::dccmainthread(void*)
 								pfts.currentFileProgress = local_dcc->file_info.size;

 								pfts.currentFileTime = 0;

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 4, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc, (LPARAM)&pfts);

+								ProtoBroadcastAck(local_dcc->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc, (LPARAM)&pfts);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 								_close(local_dcc->file_fd); local_dcc->file_fd = -1;

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 5, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc->contact, ACKTYPE_FILE, ACKRESULT_SUCCESS, local_dcc, 0);

+								ProtoBroadcastAck(local_dcc->contact, ACKTYPE_FILE, ACKRESULT_SUCCESS, local_dcc, 0);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 							}

 							// Free dcc

@@ -361,7 +361,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							{

 								_close(local_dcc->file_fd); local_dcc->file_fd = -1;

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 6, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc->contact, ACKTYPE_FILE, ACKRESULT_FAILED, local_dcc, 0);

+								ProtoBroadcastAck(local_dcc->contact, ACKTYPE_FILE, ACKRESULT_FAILED, local_dcc, 0);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 							}

 							// Free dcc

@@ -516,7 +516,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 								pfts.currentFileProgress = local_dcc7->offset;

 								pfts.currentFileTime = 0;

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 9, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc7, (LPARAM)&pfts);

+								ProtoBroadcastAck(local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc7, (LPARAM)&pfts);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 							}

 							break;

@@ -547,11 +547,11 @@ void __cdecl GGPROTO::dccmainthread(void*)
 								pfts.currentFileProgress = local_dcc7->size;

 								pfts.currentFileTime = 0;

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 10, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc7, (LPARAM)&pfts);

+								ProtoBroadcastAck(local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_DATA, local_dcc7, (LPARAM)&pfts);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 								_close(local_dcc7->file_fd); local_dcc7->file_fd = -1;

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 11, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_SUCCESS, local_dcc7, 0);

+								ProtoBroadcastAck(local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_SUCCESS, local_dcc7, 0);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 							}

 							// Free dcc

@@ -595,7 +595,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 

 							if (local_dcc7->contact) {

 								gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 12, "ft_mutex", 1);

-								ProtoBroadcastAck(m_szModuleName, local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, local_dcc7, 0);

+								ProtoBroadcastAck(local_dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, local_dcc7, 0);

 								gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 							}

 

@@ -684,7 +684,7 @@ HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 		TCHAR error[512];

 		mir_sntprintf(error, SIZEOF(error), TranslateT("Can not create transfer file. ERROR: %d: %s (dcc)\n%s"), errno, _tcserror(errno), szPath);

 		showpopup(m_tszUserName, error, GG_POPUP_ERROR);

-		ProtoBroadcastAck(m_szModuleName, dcc->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc, 0);

+		ProtoBroadcastAck(dcc->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc, 0);

 		// Free transfer

 		gg_free_dcc(dcc);

 		return 0;

@@ -722,7 +722,7 @@ HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 	if (iFtRemoveRes == -1)

 	{

 		netlog("dcc7fileallow(): File transfer denied.");

-		ProtoBroadcastAck(m_szModuleName, dcc7->contact, ACKTYPE_FILE, ACKRESULT_DENIED, dcc7, 0);

+		ProtoBroadcastAck(dcc7->contact, ACKTYPE_FILE, ACKRESULT_DENIED, dcc7, 0);

 		// Free transfer

 		gg_dcc7_free(dcc7);

 		return 0;

@@ -736,7 +736,7 @@ HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 		mir_sntprintf(error, SIZEOF(error), TranslateT("Can not create transfer file. ERROR: %d: %s (dcc7)\n%s"), errno, _tcserror(errno), szPath);

 		showpopup(m_tszUserName, error, GG_POPUP_ERROR);

 		gg_dcc7_reject(dcc7, GG_DCC7_REJECT_USER);

-		ProtoBroadcastAck(m_szModuleName, dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc7, 0);

+		ProtoBroadcastAck(dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc7, 0);

 		// Free transfer

 		gg_dcc7_free(dcc7);

 		return 0;

@@ -807,7 +807,7 @@ int GGPROTO::dccfilecancel(HANDLE hTransfer)
 	gg_LeaveCriticalSection(&ft_mutex, "dccfilecancel", 44, 1, "ft_mutex", 1);

 

 	// Send failed info

-	ProtoBroadcastAck(m_szModuleName, dcc->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc, 0);

+	ProtoBroadcastAck(dcc->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc, 0);

 	// Close file

 	if (dcc->file_fd != -1)

 	{

@@ -837,7 +837,7 @@ int GGPROTO::dcc7filecancel(HANDLE hTransfer)
 	gg_LeaveCriticalSection(&ft_mutex, "dcc7filecancel", 45, 1, "ft_mutex", 1);

 

 	// Send failed info

-	ProtoBroadcastAck(m_szModuleName, dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc7, 0);

+	ProtoBroadcastAck(dcc7->contact, ACKTYPE_FILE, ACKRESULT_FAILED, dcc7, 0);

 	// Close file

 	if (dcc7->file_fd != -1)

 	{

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index de44804182..b98bf1fda9 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -194,7 +194,7 @@ void __cdecl GGPROTO::cmdgetinfothread(void *hContact)
 {

 	netlog("cmdgetinfothread(): started. Failed info retreival.");

 	gg_sleep(100, FALSE, "cmdgetinfothread", 103, 1);

-	ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_GETINFO, ACKRESULT_FAILED, (HANDLE) 1, 0);

+	ProtoBroadcastAck(hContact, ACKTYPE_GETINFO, ACKRESULT_FAILED, (HANDLE) 1, 0);

 	netlog("cmdgetinfothread(): end.");

 }

 

@@ -278,7 +278,7 @@ void __cdecl GGPROTO::searchthread(void *)
 {

 	netlog("searchthread(): started. Failed search.");

 	gg_sleep(100, FALSE, "searchthread", 104, 1);

-	ProtoBroadcastAck(m_szModuleName, NULL, ACKTYPE_SEARCH, ACKRESULT_FAILED, (HANDLE)1, 0);

+	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_FAILED, (HANDLE)1, 0);

 #ifdef DEBUGMODE

 	netlog("searchthread(): end.");

 #endif

@@ -599,7 +599,7 @@ typedef struct
 void __cdecl GGPROTO::sendackthread(void *ack)

 {

 	gg_sleep(100, FALSE, "sendackthread", 105, 1);

-	ProtoBroadcastAck(m_szModuleName, ((GG_SEQ_ACK *)ack)->hContact,

+	ProtoBroadcastAck(((GG_SEQ_ACK *)ack)->hContact,

 		ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE) ((GG_SEQ_ACK *)ack)->seq, 0);

 	mir_free(ack);

 }

@@ -684,11 +684,11 @@ void __cdecl GGPROTO::getawaymsgthread(void *hContact)
 	gg_sleep(100, FALSE, "getawaymsgthread", 106, 1);

 	if (!db_get_s(hContact, "CList", GG_KEY_STATUSDESCR, &dbv, DBVT_TCHAR))

 	{

-		ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE) 1, (LPARAM) dbv.ptszVal);

+		ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE) 1, (LPARAM) dbv.ptszVal);

 		netlog("getawaymsgthread(): Reading away msg <%S>.", dbv.ptszVal);

 		db_free(&dbv);

 	} else {

-		ProtoBroadcastAck(m_szModuleName, hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE) 1, (LPARAM) NULL);

+		ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE) 1, (LPARAM) NULL);

 	}

 	netlog("getawaymsgthread(): end");

 }