another bunch of dead crutches: non-unicode avatar services

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

4 files changed, 11 insertions, 15 deletions

diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp
index a02171539a..7fcb0eee18 100644
--- a/protocols/Gadu-Gadu/src/avatar.cpp
+++ b/protocols/Gadu-Gadu/src/avatar.cpp
@@ -217,8 +217,7 @@ void __cdecl GGPROTO::avatarrequestthread(void*)
 					mir_free(AvatarURL); mir_free(AvatarTs);

 

 					if (iWaitFor) {

-						PROTO_AVATAR_INFORMATIONT pai = {0};

-						pai.cbSize = sizeof(pai);

+						PROTO_AVATAR_INFORMATION pai = {0};

 						pai.hContact = hContact;

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

 						if (res == GAIR_NOAVATAR)

@@ -242,7 +241,7 @@ void __cdecl GGPROTO::avatarrequestthread(void*)
 

 			int result = 0;

 

-			PROTO_AVATAR_INFORMATIONT pai = { sizeof(pai) };

+			PROTO_AVATAR_INFORMATION pai = { sizeof(pai) };

 			pai.hContact = data->hContact;

 			pai.format = getByte(pai.hContact, GG_KEY_AVATARTYPE, GG_KEYDEF_AVATARTYPE);

 

@@ -335,8 +334,7 @@ void __cdecl GGPROTO::getOwnAvatarThread(void*)
 		}

 		setByte(GG_KEY_AVATARREQUESTED, 1);

 

-		PROTO_AVATAR_INFORMATIONT pai = {0};

-		pai.cbSize = sizeof(pai);

+		PROTO_AVATAR_INFORMATION pai = { 0 };

 		getavatarinfo((WPARAM)GAIF_FORCE, (LPARAM)&pai);

 	}

 #ifdef DEBUGMODE

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 5a65872b68..f09e727a20 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1582,13 +1582,11 @@ MCONTACT GGPROTO::getcontact(uin_t uin, int create, int inlist, TCHAR *szNick)
 	// Add to notify list and pull avatar for the new contact

 	if (isonline())

 	{

-		PROTO_AVATAR_INFORMATIONT pai = {0};

-

 		gg_EnterCriticalSection(&sess_mutex, "getcontact", 32, "sess_mutex", 1);

 		gg_add_notify_ex(sess, uin, (char)(inlist ? GG_USER_NORMAL : GG_USER_OFFLINE));

 		gg_LeaveCriticalSection(&sess_mutex, "getcontact", 32, 1, "sess_mutex", 1);

 

-		pai.cbSize = sizeof(pai);

+		PROTO_AVATAR_INFORMATION pai = { 0 };

 		pai.hContact = hContact;

 		getavatarinfo((WPARAM)GAIF_FORCE, (LPARAM)&pai);

 

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 22f4c18ecf..9d0c8d4a2c 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -52,9 +52,9 @@ GGPROTO::GGPROTO(const char* pszProtoName, const TCHAR* tszUserName) :
 

 	// Register services

 	CreateProtoService(PS_GETAVATARCAPS, &GGPROTO::getavatarcaps);

-	CreateProtoService(PS_GETAVATARINFOT, &GGPROTO::getavatarinfo);

-	CreateProtoService(PS_GETMYAVATART, &GGPROTO::getmyavatar);

-	CreateProtoService(PS_SETMYAVATART, &GGPROTO::setmyavatar);

+	CreateProtoService(PS_GETAVATARINFO, &GGPROTO::getavatarinfo);

+	CreateProtoService(PS_GETMYAVATAR, &GGPROTO::getmyavatar);

+	CreateProtoService(PS_SETMYAVATAR, &GGPROTO::setmyavatar);

 

 	CreateProtoService(PS_GETMYAWAYMSG, &GGPROTO::getmyawaymsg);

 	CreateProtoService(PS_CREATEACCMGRUI, &GGPROTO::get_acc_mgr_gui);

diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index 5b1a2537f9..e9c5b1adc6 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -167,11 +167,11 @@ INT_PTR GGPROTO::getavatarcaps(WPARAM wParam, LPARAM lParam)
 

 //////////////////////////////////////////////////////////

 // gets avatar information

-// registered as ProtoService PS_GETAVATARINFOT

+// registered as ProtoService PS_GETAVATARINFO

 

 INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam)

 {

-	PROTO_AVATAR_INFORMATIONT *pai = (PROTO_AVATAR_INFORMATIONT *)lParam;

+	PROTO_AVATAR_INFORMATION *pai = (PROTO_AVATAR_INFORMATION *)lParam;

 	pai->filename[0] = 0;

 	pai->format = PA_FORMAT_UNKNOWN;

 

@@ -278,7 +278,7 @@ INT_PTR GGPROTO::getavatarinfo(WPARAM wParam, LPARAM lParam)
 

 //////////////////////////////////////////////////////////

 // gets avatar

-// registered as ProtoService PS_GETMYAVATART

+// registered as ProtoService PS_GETMYAVATAR

 

 INT_PTR GGPROTO::getmyavatar(WPARAM wParam, LPARAM lParam)

 {

@@ -308,7 +308,7 @@ INT_PTR GGPROTO::getmyavatar(WPARAM wParam, LPARAM lParam)
 

 //////////////////////////////////////////////////////////

 // sets avatar

-// registered as ProtoService PS_SETMYAVATART

+// registered as ProtoService PS_SETMYAVATAR

 

 INT_PTR GGPROTO::setmyavatar(WPARAM wParam, LPARAM lParam)

 {