From a30b2689d14a4026af2f3ebd01764bf896aaeb59 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 17 Sep 2012 14:45:41 +0000
Subject: fix for the file transfer events

git-svn-id: http://svn.miranda-ng.org/main/trunk@1590 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Gadu-Gadu/core.cpp         | 45 +++++++++++++++---------------------
 protocols/Gadu-Gadu/filetransfer.cpp | 33 ++++++++++----------------
 2 files changed, 30 insertions(+), 48 deletions(-)

(limited to 'protocols/Gadu-Gadu')

diff --git a/protocols/Gadu-Gadu/core.cpp b/protocols/Gadu-Gadu/core.cpp
index 5ed36c8eaf..48662e00df 100644
--- a/protocols/Gadu-Gadu/core.cpp
+++ b/protocols/Gadu-Gadu/core.cpp
@@ -1020,33 +1020,24 @@ retry:
 
 					//////////////////////////////////////////////////
 					// Add file recv request
-					{
-						CCSDATA ccs;
-						PROTORECVEVENT pre;
-						char *szBlob;
-						char *szFilename = (char*)dcc7->filename;
-						char *szMsg = (char*)dcc7->filename;
-						netlog("gg_mainthread(%x): Client: %d, File ack filename \"%s\" size %d.", this, dcc7->peer_uin,
-							dcc7->filename, dcc7->size);
-						// Make new ggtransfer struct
-						szBlob = (char *)malloc(sizeof(DWORD) + strlen(szFilename) + strlen(szMsg) + 2);
-						// Store current dcc
-						*(PDWORD)szBlob = (DWORD)dcc7;
-						// Store filename
-						strcpy(szBlob + sizeof(DWORD), szFilename);
-						// Store description
-						strcpy(szBlob + sizeof(DWORD) + strlen(szFilename) + 1, szMsg);
-						ccs.szProtoService = PSR_FILE;
-						ccs.hContact = dcc7->contact;
-						ccs.wParam = 0;
-						ccs.lParam = (LPARAM)&pre;
-						pre.flags = 0;
-						pre.timestamp = time(NULL);
-						pre.szMessage = szBlob;
-						pre.lParam = 0;
-						CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
-						free(szBlob);
-					}
+
+					netlog("gg_mainthread(%x): Client: %d, File ack filename \"%s\" size %d.", this, dcc7->peer_uin,
+						dcc7->filename, dcc7->size);
+
+					TCHAR* filenameT = mir_utf8decodeT((char*)dcc7->filename);
+
+					PROTORECVFILET pre = {0};
+					pre.flags = PREF_TCHAR;
+					pre.fileCount = 1;
+					pre.timestamp = time(NULL);
+					pre.tszDescription = filenameT;
+					pre.ptszFiles = &filenameT;
+					pre.lParam = (LPARAM)dcc7;
+
+					CCSDATA ccs = { dcc7->contact, PSR_FILE, 0, (LPARAM)&pre };
+					CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+
+					mir_free(filenameT);
 					e->event.dcc7_new = NULL;
 				}
 				break;
diff --git a/protocols/Gadu-Gadu/filetransfer.cpp b/protocols/Gadu-Gadu/filetransfer.cpp
index 0637273ddb..e7560e16a2 100644
--- a/protocols/Gadu-Gadu/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/filetransfer.cpp
@@ -355,31 +355,22 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							//////////////////////////////////////////////////
 							// Add file recv request
 							{
-								CCSDATA ccs;
-								PROTORECVEVENT pre;
-								char *szBlob;
-								char *szFilename = (char*)dcc->file_info.filename;
-								char *szMsg = (char*)dcc->file_info.filename;
-
 								// Make new ggtransfer struct
 								dcc->contact = getcontact(dcc->peer_uin, 0, 0, NULL);
-								szBlob = (char *)malloc(sizeof(DWORD) + strlen(szFilename) + strlen(szMsg) + 2);
-								// Store current dcc
-								*(PDWORD)szBlob = (DWORD)dcc;
-								// Store filename
-								strcpy(szBlob + sizeof(DWORD), szFilename);
-								// Store description
-								strcpy(szBlob + sizeof(DWORD) + strlen(szFilename) + 1, szMsg);
-								ccs.szProtoService = PSR_FILE;
-								ccs.hContact = dcc->contact;
-								ccs.wParam = 0;
-								ccs.lParam = (LPARAM)&pre;
-								pre.flags = 0;
+								TCHAR* filenameT = mir_utf8decodeT((char*)dcc->file_info.filename);
+
+								PROTORECVFILET pre = {0};
+								pre.flags = PREF_TCHAR;
+								pre.fileCount = 1;
 								pre.timestamp = time(NULL);
-								pre.szMessage = szBlob;
-								pre.lParam = 0;
+								pre.tszDescription = filenameT;
+								pre.ptszFiles = &filenameT;
+								pre.lParam = (LPARAM)dcc7;
+
+								CCSDATA ccs = { dcc7->contact, PSR_FILE, 0, (LPARAM)&pre };
 								CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
-								free(szBlob);
+
+								mir_free(filenameT);
 							}
 							break;
 
-- 
cgit v1.2.3