From f25d585f07dafbcfa99e0c33dc9bbe0d72230074 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 7 Apr 2015 14:22:35 +0000
Subject: - MRA clients detection for ICQ; - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@12656 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IcqOscarJ/src/icq_proto.cpp | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'protocols/IcqOscarJ/src/icq_proto.cpp')

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index 45c3e87768..c811a77704 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -468,7 +468,6 @@ HANDLE __cdecl CIcqProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const T
 {
 	DWORD dwUin;
 	uid_str szUid;
-
 	if (getContactUid(hContact, &dwUin, &szUid))
 		return 0; // Invalid contact
 
@@ -538,10 +537,10 @@ int __cdecl CIcqProto::FileCancel(MCONTACT hContact, HANDLE hTransfer)
 int __cdecl CIcqProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason)
 {
 	int nReturnValue = 1;
-	DWORD dwUin;
-	uid_str szUid;
 	basic_filetransfer *ft = (basic_filetransfer*)hTransfer;
 
+	DWORD dwUin;
+	uid_str szUid;
 	if (getContactUid(hContact, &dwUin, &szUid))
 		return 1; // Invalid contact
 
@@ -694,7 +693,6 @@ int __cdecl CIcqProto::GetInfo(MCONTACT hContact, int infoType)
 	if (icqOnline()) {
 		DWORD dwUin;
 		uid_str szUid;
-
 		if (getContactUid(hContact, &dwUin, &szUid))
 			return 1; // Invalid contact
 
@@ -945,27 +943,20 @@ int __cdecl CIcqProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 int __cdecl CIcqProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hContactsList)
 {
 	if (hContact && hContactsList) {
-		int i;
 		DWORD dwUin;
 		uid_str szUid;
-		WORD wRecipientStatus;
-		DWORD dwCookie;
-
-		if (getContactUid(hContact, &dwUin, &szUid)) { // Invalid contact
+		if (getContactUid(hContact, &dwUin, &szUid)) // Invalid contact
 			return ReportGenericSendError(hContact, ACKTYPE_CONTACTS, "The receiver has an invalid user ID.");
-		}
 
-		wRecipientStatus = getContactStatus(hContact);
+		WORD wRecipientStatus = getContactStatus(hContact);
 
 		// Failures
-		if (!icqOnline()) {
+		DWORD dwCookie;
+		if (!icqOnline())
 			dwCookie = ReportGenericSendError(hContact, ACKTYPE_CONTACTS, "You cannot send messages when you are offline.");
-		}
-		else if (!hContactsList || (nContacts < 1) || (nContacts > MAX_CONTACTSSEND)) {
+		else if (!hContactsList || (nContacts < 1) || (nContacts > MAX_CONTACTSSEND))
 			dwCookie = ReportGenericSendError(hContact, ACKTYPE_CONTACTS, "Bad data (internal error #1)");
-		}
-		// OK
-		else {
+		else { // OK
 			if (CheckContactCapabilities(hContact, CAPF_CONTACTS) && wRecipientStatus != ID_STATUS_OFFLINE) { // Use the new format if possible
 				struct icq_contactsend_s* contacts = NULL;
 
@@ -976,6 +967,7 @@ int __cdecl CIcqProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONT
 				memset(contacts, 0, (sizeof(struct icq_contactsend_s) * nContacts));
 
 				size_t nDataLen = 0, nNamesLen = 0;
+				int i;
 				for (i = 0; i < nContacts; i++) {
 					uid_str szContactUid;
 
@@ -1082,7 +1074,7 @@ int __cdecl CIcqProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONT
 				char szCount[17];
 				struct icq_contactsend_s* contacts = NULL;
 				uid_str szContactUid;
-
+				int i;
 
 				// Format the body
 				// This is kinda messy, but there is no simple way to do it. First
@@ -1195,7 +1187,6 @@ HANDLE __cdecl CIcqProto::SendFile(MCONTACT hContact, const TCHAR* szDescription
 	if (hContact && szDescription && ppszFiles) {
 		DWORD dwUin;
 		uid_str szUid;
-
 		if (getContactUid(hContact, &dwUin, &szUid))
 			return 0; // Invalid contact
 
@@ -1490,7 +1481,6 @@ int __cdecl CIcqProto::SetApparentMode(MCONTACT hContact, int mode)
 {
 	DWORD uin;
 	uid_str uid;
-
 	if (getContactUid(hContact, &uin, &uid))
 		return 1; // Invalid contact
 
-- 
cgit v1.2.3