Gadu-Gadu protocol

- debug log TCHAR's via debugLog() not debugLogA()




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

8 files changed, 41 insertions, 41 deletions

diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp
index 7086aee901..e09b7da53c 100644
--- a/protocols/Gadu-Gadu/src/avatar.cpp
+++ b/protocols/Gadu-Gadu/src/avatar.cpp
@@ -33,9 +33,9 @@ void GGPROTO::getAvatarFilename(HANDLE hContact, TCHAR *pszDest, int cbLen)
 	if (_taccess(pszDest, 0)) {

 		int ret = CreateDirectoryTreeT(pszDest);

 		if (ret == 0)

-			debugLogA("getAvatarFilename(): Created new directory for avatar cache: %S.", pszDest);

+			debugLog(_T("getAvatarFilename(): Created new directory for avatar cache: %s."), pszDest);

 		else {

-			debugLogA("getAvatarFilename(): Can not create directory for avatar cache: %S. errno=%d: %s", pszDest, errno, strerror(errno));

+			debugLog(_T("getAvatarFilename(): Can not create directory for avatar cache: %s. errno=%d: %s"), pszDest, errno, strerror(errno));

 			TCHAR error[512];

 			mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create avatars cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pszDest);

 			showpopup(m_tszUserName, error, GG_POPUP_ERROR | GG_POPUP_ALLOW_MSGBOX | GG_POPUP_ONCE);

@@ -269,9 +269,9 @@ void __cdecl GGPROTO::avatarrequestthread(void*)
 						_write(file_fd, resp->pData, resp->dataLength);

 						_close(file_fd);

 						result = 1;

-						debugLogA("avatarrequestthread() new avatar_transfers item. Saved data from url=%s to file=%S.", data->szAvatarURL, pai.filename);

+						debugLog(_T("avatarrequestthread() new avatar_transfers item. Saved data from url=%s to file=%s."), data->szAvatarURL, pai.filename);

 					} else {

-						debugLogA("avatarrequestthread(): _topen file %S error. errno=%d: %s", pai.filename, errno, strerror(errno));

+						debugLog(_T("avatarrequestthread(): _topen file %s error. errno=%d: %s"), pai.filename, errno, strerror(errno));

 						TCHAR error[512];

 						mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai.filename);

 						showpopup(m_tszUserName, error, GG_POPUP_ERROR);

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 074c2128ba..26a0f6d477 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -381,7 +381,7 @@ retry:
 	p.status_descr = mir_utf8encodeT(getstatusmsg(m_iDesiredStatus));

 	p.status = status_m2gg(m_iDesiredStatus, p.status_descr != NULL);

 

-	debugLogA("mainthread() (%x): Connecting with number %d, status %d and description \"%S\".", this, p.uin, m_iDesiredStatus,

+	debugLog(_T("mainthread() (%x): Connecting with number %d, status %d and description \"%s\"."), this, p.uin, m_iDesiredStatus,

 				p.status_descr ? getstatusmsg(m_iDesiredStatus) : _T("<none>"));

 	gg_LeaveCriticalSection(&modemsg_mutex, "mainthread", 13, 1, "modemsg_mutex", 1);

 

@@ -839,7 +839,7 @@ retry:
 							gcevent.ptszNick = (TCHAR*) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) getcontact(e->event.msg.sender, 1, 0, NULL), GCDNF_TCHAR);

 							gcevent.time = (!(e->event.msg.msgclass & GG_CLASS_OFFLINE) || e->event.msg.time > (t - timeDeviation)) ? t : e->event.msg.time;

 							gcevent.dwFlags = GC_TCHAR | GCEF_ADDTOLOG;

-							debugLogA("mainthread() (%x): Conference message to room %S & id %S.", this, chat, id);

+							debugLog(_T("mainthread() (%x): Conference message to room %s & id %s."), this, chat, id);

 							CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gcevent);

 							mir_free(messageT);

 						}

@@ -914,7 +914,7 @@ retry:
 						gcevent.time = e->event.multilogon_msg.time;

 						gcevent.bIsMe = 1;

 						gcevent.dwFlags = GC_TCHAR | GCEF_ADDTOLOG;

-						debugLogA("mainthread() (%x): Sent conference message to room %S.", this, chat);

+						debugLog(_T("mainthread() (%x): Sent conference message to room %s."), this, chat);

 						CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gcevent);

 						mir_free(messageT);

 						mir_free(nickT);

@@ -1555,7 +1555,7 @@ HANDLE GGPROTO::getcontact(uin_t uin, int create, int inlist, TCHAR *szNick)
 

 	HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_ADD, 0, 0);

 	if (!hContact) {

-		debugLogA("getcontact(): Failed to create Gadu-Gadu contact %S", szNick);

+		debugLog(_T("getcontact(): Failed to create Gadu-Gadu contact %s"), szNick);

 		return NULL;

 	}

 

@@ -1722,7 +1722,7 @@ void GGPROTO::changecontactstatus(uin_t uin, int status, const TCHAR *idescr, in
 	// Check if there's description and if it's not empty

 	if (idescr && *idescr)

 	{

-		debugLogA("changecontactstatus(): Saving for %d status descr \"%S\".", uin, idescr);

+		debugLog(_T("changecontactstatus(): Saving for %d status descr \"%s\"."), uin, idescr);

 		db_set_ts(hContact, "CList", GG_KEY_STATUSDESCR, idescr);

 	} else {

 		// Remove status if there's nothing

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index a790e63ffc..0930378b6d 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -157,7 +157,7 @@ void GGPROTO::cleanuplastplugin(DWORD version)
 		TCHAR avatarsPath[MAX_PATH];

 		mir_sntprintf(avatarsPath, MAX_PATH, _T("%s\\%s"), VARST( _T("%miranda_avatarcache%")), m_tszUserName);

 

-		debugLogA("cleanuplastplugin() 1: miranda_avatarcache = %S", avatarsPath);

+		debugLog(_T("cleanuplastplugin() 1: miranda_avatarcache = %s"), avatarsPath);

 

 		if (avatarsPath !=  NULL){

 			HANDLE hFind = INVALID_HANDLE_VALUE;

@@ -170,7 +170,7 @@ void GGPROTO::cleanuplastplugin(DWORD version)
 					TCHAR filePathT [2*MAX_PATH + 10];

 					mir_sntprintf(filePathT, 2*MAX_PATH + 10, _T("%s\\%s"), avatarsPath, ffd.cFileName);

 					if (!_taccess(filePathT, 0)){

-						debugLogA("cleanuplastplugin() 1: remove file = %S", filePathT);

+						debugLog(_T("cleanuplastplugin() 1: remove file = %s"), filePathT);

 						_tremove(filePathT);

 					}

 				} while (FindNextFile(hFind, &ffd) != 0);

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 483bdd0716..0ccbb67a87 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -681,7 +681,7 @@ void __cdecl GGPROTO::getawaymsgthread(void *hContact)
 	if (!db_get_s(hContact, "CList", GG_KEY_STATUSDESCR, &dbv, DBVT_TCHAR))

 	{

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

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

+		debugLog(_T("getawaymsgthread(): Reading away msg <%s>."), dbv.ptszVal);

 		db_free(&dbv);

 	} else {

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

@@ -707,7 +707,7 @@ int GGPROTO::SetAwayMsg(int iStatus, const PROTOCHAR *newMsg)
 	int status = gg_normalizestatus(iStatus);

 	TCHAR **msgPtr;

 

-	debugLogA("SetAwayMsg(): PS_SETAWAYMSG(%d, \"%S\").", iStatus, newMsg);

+	debugLog(_T("SetAwayMsg(): PS_SETAWAYMSG(%d, \"%s\")."), iStatus, newMsg);

 

 	gg_EnterCriticalSection(&modemsg_mutex, "SetAwayMsg", 55, "modemsg_mutex", 1);

 	// Select proper our msg ptr

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index fbc3c3bed9..ad7933052f 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -137,7 +137,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam)
 	// Window terminated (Miranda exit)

 	if (gch->pDest->iType == SESSION_TERMINATE)

 	{

-		debugLogA("gc_event(): Terminating chat %x, id %S from chat window...", chat, gch->pDest->ptszID);

+		debugLog(_T("gc_event(): Terminating chat %x, id %s from chat window..."), chat, gch->pDest->ptszID);

 		// Destroy chat entry

 		free(chat->recipients);

 		list_remove(&chats, chat, 1);

@@ -188,7 +188,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam)
 		gcevent.time = time(NULL);

 		gcevent.bIsMe = 1;

 		gcevent.dwFlags = GC_TCHAR | GCEF_ADDTOLOG;

-		debugLogA("gc_event(): Sending conference message to room %S, \"%S\".", gch->pDest->ptszID, gch->ptszText);

+		debugLog(_T("gc_event(): Sending conference message to room %s, \"%s\"."), gch->pDest->ptszID, gch->ptszText);

 		CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gcevent);

 		mir_free(nickT);

 		

@@ -208,7 +208,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam)
 		if ((uin = _ttoi(gch->ptszUID)) && (hContact = getcontact(uin, 1, 0, NULL)))

 			CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0);

 	}

-	debugLogA("gc_event(): Unhandled event %d, chat %x, uin %d, text \"%S\".", gch->pDest->iType, chat, uin, gch->ptszText);

+	debugLog(_T("gc_event(): Unhandled event %d, chat %x, uin %d, text \"%s\"."), gch->pDest->iType, chat, uin, gch->ptszText);

 

 	return 0;

 }

@@ -259,9 +259,9 @@ TCHAR* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_count
 			if (found == recipients_count)

 			{

 				if (chat->ignore)

-					debugLogA("gc_getchat(): Ignoring existing id %S, size %d.", chat->id, chat->recipients_count);

+					debugLog(_T("gc_getchat(): Ignoring existing id %s, size %d."), chat->id, chat->recipients_count);

 				else

-					debugLogA("gc_getchat(): Returning existing id %S, size %d.", chat->id, chat->recipients_count);

+					debugLog(_T("gc_getchat(): Returning existing id %s, size %d."), chat->id, chat->recipients_count);

 				return !(chat->ignore) ? chat->id : NULL;

 			}

 		}

@@ -307,7 +307,7 @@ TCHAR* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_count
 			for(i = 0; i < recipients_count; i++)

 				chat->recipients[i] = recipients[i];

 			if (sender) chat->recipients[i] = sender;

-			debugLogA("gc_getchat(): Ignoring new chat %S, count %d.", chat->id, chat->recipients_count);

+			debugLog(_T("gc_getchat(): Ignoring new chat %s, count %d."), chat->id, chat->recipients_count);

 			list_add(&chats, chat, 0);

 			return NULL;

 		}

@@ -335,7 +335,7 @@ TCHAR* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_count
 	// Create new room

 	if (CallServiceSync(MS_GC_NEWSESSION, 0, (LPARAM) &gcwindow))

 	{

-		debugLogA("gc_getchat(): Cannot create new chat window %S.", chat->id);

+		debugLog(_T("gc_getchat(): Cannot create new chat window %s."), chat->id);

 		free(name);

 		free(chat);

 		return NULL;

@@ -369,7 +369,7 @@ TCHAR* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_count
 		gcevent.bIsMe = 1;

 		CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gcevent);

 		mir_free(nickT);

-		debugLogA("gc_getchat(): Myself %S: %S (%S) to the list...", gcevent.ptszUID, gcevent.ptszNick, gcevent.ptszStatus);

+		debugLog(_T("gc_getchat(): Myself %s: %s (%s) to the list..."), gcevent.ptszUID, gcevent.ptszNick, gcevent.ptszStatus);

 	}

 	else debugLogA("gc_getchat(): Myself adding failed with uin %d !!!", uin);

 

@@ -390,14 +390,14 @@ TCHAR* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_count
 			gcevent.ptszNick = TranslateT("'Unknown'");

 		gcevent.bIsMe = 0;

 		gcevent.dwFlags = GC_TCHAR;

-		debugLogA("gc_getchat(): Added %S: %S (%S) to the list...", gcevent.ptszUID, gcevent.ptszNick, gcevent.pszStatus);

+		debugLog(_T("gc_getchat(): Added %s: %s (%s) to the list..."), gcevent.ptszUID, gcevent.ptszNick, gcevent.pszStatus);

 		CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gcevent);

 	}

 	gcdest.iType = GC_EVENT_CONTROL;

 	CallServiceSync(MS_GC_EVENT, SESSION_INITDONE, (LPARAM)&gcevent);

 	CallServiceSync(MS_GC_EVENT, SESSION_ONLINE, (LPARAM)&gcevent);

 

-	debugLogA("gc_getchat(): Returning new chat window %S, count %d.", chat->id, chat->recipients_count);

+	debugLog(_T("gc_getchat(): Returning new chat window %s, count %d."), chat->id, chat->recipients_count);

 	list_add(&chats, chat, 0);

 	return chat->id;

 }

@@ -665,7 +665,7 @@ int GGPROTO::gc_changenick(HANDLE hContact, TCHAR *ptszNick)
 					gce.dwFlags = GC_TCHAR;

 					gce.ptszText = ptszNick;

 

-					debugLogA("gc_changenick(): Found room %S with uin %d, sending nick change %S.", chat->id, uin, id);

+					debugLog(_T("gc_changenick(): Found room %s with uin %d, sending nick change %s."), chat->id, uin, id);

 					CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);

 

 					break;

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index 9f2bf2c39e..88efe07a86 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -270,11 +270,11 @@ int gg_img_saveimage(HWND hwnd, GGIMAGEENTRY *dat)
 		{

 			fwrite(dat->lpData, dat->nSize, 1, fp);

 			fclose(fp);

-			gg->debugLogA("gg_img_saveimage(): Image saved to %S.", szFileName);

+			gg->debugLog(_T("gg_img_saveimage(): Image saved to %s."), szFileName);

 		}

 		else

 		{

-			gg->debugLogA("gg_img_saveimage(): Cannot save image to %S.", szFileName);

+			gg->debugLog(_T("gg_img_saveimage(): Cannot save image to %s."), szFileName);

 			MessageBox(hwnd, TranslateT("Image cannot be written to disk."), gg->m_tszUserName, MB_OK | MB_ICONERROR);

 		}

 	}

@@ -826,9 +826,9 @@ int GGPROTO::img_displayasmsg(HANDLE hContact, void *img)
 	if ( _taccess(szPath, 0)){

 		int ret = CreateDirectoryTreeT(szPath);

 		if (ret == 0){

-			debugLogA("img_displayasmsg(): Created new directory for image cache: %S.", szPath);

+			debugLog(_T("img_displayasmsg(): Created new directory for image cache: %s."), szPath);

 		} else {

-			debugLogA("img_displayasmsg(): Can not create directory for image cache: %S. errno=%d: %s", szPath, errno, strerror(errno));

+			debugLog(_T("img_displayasmsg(): Can not create directory for image cache: %s. errno=%d: %s"), szPath, errno, strerror(errno));

 			TCHAR error[512];

 			mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot create image cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szPath);

 			showpopup(m_tszUserName, error, GG_POPUP_ERROR | GG_POPUP_ALLOW_MSGBOX | GG_POPUP_ONCE);

@@ -852,7 +852,7 @@ int GGPROTO::img_displayasmsg(HANDLE hContact, void *img)
 			res = fwrite(dat->lpData, dat->nSize, 1, fp) > 0;

 			fclose(fp);

 		} else {

-			debugLogA("img_displayasmsg(): Cannot open file %S for write image. errno=%d: %s", szPath, errno, strerror(errno));

+			debugLog(_T("img_displayasmsg(): Cannot open file %s for write image. errno=%d: %s"), szPath, errno, strerror(errno));

 			TCHAR error[512];

 			mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot save received image to file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szPath);

 			showpopup(m_tszUserName, error, GG_POPUP_ERROR);

@@ -869,11 +869,11 @@ int GGPROTO::img_displayasmsg(HANDLE hContact, void *img)
 		pre.timestamp = time(NULL);

 		pre.tszMessage = image_msg;

 		ProtoChainRecvMsg(hContact, &pre);

-		debugLogA("img_displayasmsg(): Image saved to %S.", szPath);

+		debugLog(_T("img_displayasmsg(): Image saved to %s."), szPath);

 	}

 	else

 	{

-		debugLogA("img_displayasmsg(): Cannot save image to %S.", szPath);

+		debugLog(_T("img_displayasmsg(): Cannot save image to %s."), szPath);

 	}

 

 	return 0;

@@ -983,7 +983,7 @@ void* GGPROTO::img_loadpicture(gg_event* e, TCHAR *szFileName)
 		FILE *fp = _tfopen(szFileName, _T("rb"));

 		if (!fp) {

 			free(dat);

-			debugLogA("img_loadpicture(): fopen(\"%S\", \"rb\") failed. errno=%d: %s", szFileName, errno, strerror(errno));

+			debugLog(_T("img_loadpicture(): fopen(\"%s\", \"rb\") failed. errno=%d: %s"), szFileName, errno, strerror(errno));

 			TCHAR error[512];

 			mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot open image file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), szFileName);

 			showpopup(m_tszUserName, error, GG_POPUP_ERROR);

@@ -995,7 +995,7 @@ void* GGPROTO::img_loadpicture(gg_event* e, TCHAR *szFileName)
 		{

 			fclose(fp);

 			free(dat);

-			debugLogA("img_loadpicture(): Zero file size \"%S\" failed.", szFileName);

+			debugLog(_T("img_loadpicture(): Zero file size \"%s\" failed."), szFileName);

 			return NULL;

 		}

 		// Maximum acceptable image size

@@ -1003,7 +1003,7 @@ void* GGPROTO::img_loadpicture(gg_event* e, TCHAR *szFileName)
 		{

 			fclose(fp);

 			free(dat);

-			debugLogA("img_loadpicture(): Image size of \"%S\" exceeds 255 KB.", szFileName);

+			debugLog(_T("img_loadpicture(): Image size of \"%s\" exceeds 255 KB."), szFileName);

 			MessageBox(NULL, TranslateT("Image exceeds maximum allowed size of 255 KB."), m_tszUserName, MB_OK | MB_ICONEXCLAMATION);

 			return NULL;

 		}

@@ -1014,7 +1014,7 @@ void* GGPROTO::img_loadpicture(gg_event* e, TCHAR *szFileName)
 			free(dat->lpData);

 			fclose(fp);

 			free(dat);

-			debugLogA("img_loadpicture(): Reading file \"%S\" failed.", szFileName);

+			debugLog(_T("img_loadpicture(): Reading file \"%s\" failed."), szFileName);

 			return NULL;

 		}

 		fclose(fp);

diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index 1b181db775..523d077111 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -391,7 +391,7 @@ INT_PTR GGPROTO::import_text(WPARAM wParam, LPARAM lParam)
 		TCHAR error[256];

 		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be imported from file \"%s\" because of error:\n\t%s (Error: %d)"), str, _tcserror(errno), errno);

 		MessageBox(NULL, error, m_tszUserName, MB_OK | MB_ICONSTOP);

-		debugLogA("import_text(): Cannot import list from file \"%S\". errno=%d: %s", str, errno, strerror(errno));

+		debugLog(_T("import_text(): Cannot import list from file \"%s\". errno=%d: %s"), str, errno, strerror(errno));

 	}

 

 	return 0;

@@ -434,7 +434,7 @@ INT_PTR GGPROTO::export_text(WPARAM wParam, LPARAM lParam)
 	ofn.lpstrDefExt = _T("txt");

 

 #ifdef DEBUGMODE

-	debugLogA("export_text(%S).", str);

+	debugLog(_T("export_text(%s)."), str);

 #endif

 	if (!GetSaveFileName(&ofn)) return 0;

 

diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index f905023250..3a1ae69ecd 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -236,12 +236,12 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam)
 			}

 

 			requestAvatarTransfer(pai->hContact, AvatarURL);

-			debugLogA("getavatarinfo(): Incoming request for avatar information. uin=%d. Avatar hash unchanged but file %S does not exist. errno=%d: %s. requestAvatarTransfer() fired. return GAIR_WAITFOR", uin, pai->filename, errno, strerror(errno));

+			debugLog(_T("getavatarinfo(): Incoming request for avatar information. uin=%d. Avatar hash unchanged but file %s does not exist. errno=%d: %s. requestAvatarTransfer() fired. return GAIR_WAITFOR"), uin, pai->filename, errno, strerror(errno));

 			return GAIR_WAITFOR;

 		}

 		if ((wParam & GAIF_FORCE) != 0) {

 			if (_tremove(pai->filename) != 0){

-				debugLogA("getavatarinfo(): refresh. _tremove 1 file %S error. errno=%d: %s", pai->filename, errno, strerror(errno));

+				debugLog(_T("getavatarinfo(): refresh. _tremove 1 file %s error. errno=%d: %s"), pai->filename, errno, strerror(errno));

 				TCHAR error[512];

 				mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot remove old avatar file before refresh. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai->filename);

 				showpopup(m_tszUserName, error, GG_POPUP_ERROR);

@@ -256,7 +256,7 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam)
 		if (AvatarHash == NULL && AvatarSavedHash != NULL) {

 			getAvatarFilename(pai->hContact, pai->filename, sizeof(pai->filename));

 			if (_tremove(pai->filename) != 0){

-				debugLogA("getavatarinfo(): delete. _tremove file %S error. errno=%d: %s", pai->filename, errno, strerror(errno));

+				debugLog(_T("getavatarinfo(): delete. _tremove file %s error. errno=%d: %s"), pai->filename, errno, strerror(errno));

 				TCHAR error[512];

 				mir_sntprintf(error, SIZEOF(error), TranslateT("Cannot remove old avatar file. ERROR: %d: %s\n%s"), errno, _tcserror(errno), pai->filename);

 				showpopup(m_tszUserName, error, GG_POPUP_ERROR);

@@ -303,7 +303,7 @@ INT_PTR GGPROTO::getmyavatar(WPARAM wParam, LPARAM lParam)
 		debugLogA("getmyavatar(): Incoming request for self avatar information. returned ok.");

 		return 0;

 	} else {

-		debugLogA("getmyavatar(): Incoming request for self avatar information. saved avatar file %S does not exist. return -1 (error)", szFilename);

+		debugLog(_T("getmyavatar(): Incoming request for self avatar information. saved avatar file %s does not exist. return -1 (error)"), szFilename);

 		return -1;

 	}