- MRA clients detection for ICQ;

- code cleaning

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

1 files changed, 7 insertions, 5 deletions

diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index 43cd5eba33..20775e1d84 100644
--- a/protocols/IcqOscarJ/src/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
@@ -324,11 +324,10 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg, UINT message, WPARAM wPa
 			}

 			else { // If the server refused to add the contact without authorization,

 				// we try again _with_ authorization TLV

-				DWORD dwUIN;

-				uid_str szUID;

-

 				ppro->setByte(hCurrentContact, "Auth", 1);

 

+				DWORD dwUIN;

+				uid_str szUID;

 				if (!ppro->getContactUid(hCurrentContact, &dwUIN, &szUID)) {

 					currentAction = ACTION_ADDBUDDYAUTH;

 					currentSequence = sendUploadBuddy(ppro, hCurrentContact, ICQ_LISTS_ADDTOLIST, dwUIN, szUID, wNewContactId, wNewGroupId, SSI_ITEM_BUDDY);

@@ -488,8 +487,6 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg, UINT message, WPARAM wPa
 		{

 			MCONTACT hContact;

 			HANDLE hItem;

-			DWORD dwUin;

-			uid_str szUid;

 			char *pszNick;

 			char *pszGroup;

 			int isChecked;

@@ -528,6 +525,8 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg, UINT message, WPARAM wPa
 						isChecked = SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0) != 0;

 						isOnServer = ppro->getWord(hContact, DBSETTING_SERVLIST_ID, 0) != 0;

 

+						DWORD dwUin;

+						uid_str szUid;

 						bUidOk = !ppro->getContactUid(hContact, &dwUin, &szUid);

 

 						// Is this one out of sync?

@@ -670,6 +669,9 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg, UINT message, WPARAM wPa
 					WORD wIgnoreId = ppro->getWord(hContact, DBSETTING_SERVLIST_IGNORE, 0);

 

 					hCurrentContact = hContact;

+

+					DWORD dwUin;

+					uid_str szUid;

 					ppro->getContactUid(hContact, &dwUin, &szUid);

 

 					if (wApparentMode == ID_STATUS_ONLINE) { // contact is on the visible list