From 98967bf2ece5792ea9ff2fb0cc52e2605a79bf6b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 1 Jun 2012 12:59:38 +0000
Subject: old junk code removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@251 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/jabber_iqid.cpp | 68 ++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 40 deletions(-)

(limited to 'protocols')

diff --git a/protocols/JabberG/jabber_iqid.cpp b/protocols/JabberG/jabber_iqid.cpp
index 1a69ab8900..db15079953 100644
--- a/protocols/JabberG/jabber_iqid.cpp
+++ b/protocols/JabberG/jabber_iqid.cpp
@@ -664,7 +664,9 @@ LBL_NoTypeSpecified:
 		case PA_FORMAT_PNG:  szPicType = _T("image/png");	break;
 		case PA_FORMAT_JPEG: szPicType = _T("image/jpeg");	break;
 		default:
-			goto LBL_Ret;
+LBL_Ret:
+			mir_free( buffer );
+			return;
 		}
 	}
 	else {
@@ -678,25 +680,8 @@ LBL_NoTypeSpecified:
 			goto LBL_NoTypeSpecified;
 	}
 
-	DWORD nWritten;
-	TCHAR szTempPath[MAX_PATH], szAvatarFileName[MAX_PATH];
-	JABBER_LIST_ITEM *item;
-	DBVARIANT dbv;
-
-	if ( hContact ) {
-		if ( GetTempPath( SIZEOF( szTempPath ), szTempPath ) <= 0 )
-			lstrcpy( szTempPath, _T(".\\"));
-		if ( !GetTempFileName( szTempPath, m_tszUserName, GetTickCount(), szAvatarFileName )) {
-LBL_Ret:
-			mir_free( buffer );
-			return;
-		}
-
-		TCHAR* p = _tcsrchr( szAvatarFileName, '.' );
-		if ( p != NULL )
-			lstrcpy( p+1, szPicType + 6 );
-	}
-	else GetAvatarFileName( NULL, szAvatarFileName, SIZEOF( szAvatarFileName ));
+	TCHAR szAvatarFileName[MAX_PATH];
+	GetAvatarFileName( hContact, szAvatarFileName, SIZEOF( szAvatarFileName ));
 
 	Log( "Picture file name set to " TCHAR_STR_PARAM, szAvatarFileName );
 	HANDLE hFile = CreateFile( szAvatarFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
@@ -704,6 +689,7 @@ LBL_Ret:
 		goto LBL_Ret;
 
 	Log( "Writing %d bytes", bufferLen );
+	DWORD nWritten;
 	if ( !WriteFile( hFile, buffer, bufferLen, &nWritten, NULL ))
 		goto LBL_Ret;
 
@@ -716,27 +702,29 @@ LBL_Ret:
 
 		Log( "My picture saved to " TCHAR_STR_PARAM, szAvatarFileName );
 	}
-	else if ( !JGetStringT( hContact, "jid", &dbv )) {
-		item = ListGetItemPtr( LIST_ROSTER, jid );
-		if ( item == NULL ) {
-			item = ListAdd( LIST_VCARD_TEMP, jid ); // adding to the temp list to store information about photo
-			item->bUseResource = TRUE;
-		}
-		if ( item != NULL ) {
-			hasPhoto = TRUE;
-			if ( item->photoFileName )
-				DeleteFile( item->photoFileName );
-			replaceStr( item->photoFileName, szAvatarFileName );
-			Log( "Contact's picture saved to " TCHAR_STR_PARAM, szAvatarFileName );
-
-			if (JGetWord( hContact, "Status", ID_STATUS_OFFLINE ) == ID_STATUS_OFFLINE) {
-				char szHashValue[ MAX_PATH ];
-				if ( JGetStaticString( "AvatarHash", hContact, szHashValue, sizeof( szHashValue )))
-					OnIqResultGotAvatar( hContact, o, xmlGetText( m ));
+	else {
+		DBVARIANT dbv;
+		if ( !JGetStringT( hContact, "jid", &dbv )) {
+			JABBER_LIST_ITEM *item = ListGetItemPtr( LIST_ROSTER, jid );
+			if ( item == NULL ) {
+				item = ListAdd( LIST_VCARD_TEMP, jid ); // adding to the temp list to store information about photo
+				item->bUseResource = TRUE;
 			}
-		}
-		JFreeVariant( &dbv );
-	}
+			if ( item != NULL ) {
+				hasPhoto = TRUE;
+				if ( item->photoFileName )
+					DeleteFile( item->photoFileName );
+				replaceStr( item->photoFileName, szAvatarFileName );
+				Log( "Contact's picture saved to " TCHAR_STR_PARAM, szAvatarFileName );
+
+				if (JGetWord( hContact, "Status", ID_STATUS_OFFLINE ) == ID_STATUS_OFFLINE) {
+					char szHashValue[ MAX_PATH ];
+					if ( JGetStaticString( "AvatarHash", hContact, szHashValue, sizeof( szHashValue )))
+						OnIqResultGotAvatar( hContact, o, xmlGetText( m ));
+			}	}
+
+			JFreeVariant( &dbv );
+	}	}
 
 	if ( !hasPhoto )
 		DeleteFile( szAvatarFileName );
-- 
cgit v1.2.3