From 1ce3da1cca093143d9629bc46e221dd8be962e12 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 31 May 2015 11:46:05 +0000
Subject: - MAllStrings: a handy union to hold an incoming string parameter of
 any type; - FNAMECHAR: atavism extincted; - PROTOSEARCHRESULT: structure
 prepared to use results of any type, including utf

git-svn-id: http://svn.miranda-ng.org/main/trunk@13932 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Gadu-Gadu/src/core.cpp     | 22 +++++++++++-----------
 protocols/Gadu-Gadu/src/gg_proto.cpp | 10 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'protocols/Gadu-Gadu/src')

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 2bf2907cf4..c4bc303fa9 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -651,17 +651,17 @@ retry:
 								}
 							}
 
-							GGSEARCHRESULT sr;
-							memset(&sr, 0, sizeof(sr));
-							sr.cbSize = sizeof(sr);
-							sr.flags = PSR_TCHAR;
-							sr.nick = __nickname;
-							sr.firstName = __firstname;
-							sr.lastName = __lastname;
-							sr.email = strFmt2;
-							sr.id = _ultot(uin, strFmt1, 10);
-							sr.uin = uin;
-							ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE) 1, (LPARAM)&sr);
+							GGSEARCHRESULT psr;
+							memset(&psr, 0, sizeof(psr));
+							psr.cbSize = sizeof(psr);
+							psr.flags = PSR_TCHAR;
+							psr.nick.t = __nickname;
+							psr.firstName.t = __firstname;
+							psr.lastName.t = __lastname;
+							psr.email.t = strFmt2;
+							psr.id.t = _ultot(uin, strFmt1, 10);
+							psr.uin = uin;
+							ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE) 1, (LPARAM)&psr);
 						}
 
 						if (((res->seq == GG_SEQ_INFO || res->seq == GG_SEQ_GETNICK) && hContact != NULL)
diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index a61ec36c60..f4ec6475b2 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -124,20 +124,20 @@ GGPROTO::~GGPROTO()
 //////////////////////////////////////////////////////////
 // when contact is added to list
 
-MCONTACT GGPROTO::AddToList(int flags, PROTOSEARCHRESULT *psr)
+MCONTACT GGPROTO::AddToList(int flags, PROTOSEARCHRESULT *pmsr)
 {
 #ifdef DEBUGMODE
 	debugLogA("AddToList(): id=%s");
 #endif
-	GGSEARCHRESULT *sr = (GGSEARCHRESULT *)psr;
+	GGSEARCHRESULT *psr = (GGSEARCHRESULT *)pmsr;
 	uin_t uin;
 
 	if (psr->cbSize == sizeof(GGSEARCHRESULT))
-		uin = sr->uin;
+		uin = psr->uin;
 	else
-		uin = _ttoi(psr->id);
+		uin = _ttoi(psr->id.t);
 
-	return getcontact(uin, 1, flags & PALF_TEMPORARY ? 0 : 1, sr->nick);
+	return getcontact(uin, 1, flags & PALF_TEMPORARY ? 0 : 1, psr->nick.t);
 }
 
 //////////////////////////////////////////////////////////
-- 
cgit v1.2.3