- fix for uninitialized variables;

- code cleaning in clists

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

1 files changed, 11 insertions, 6 deletions

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 48ff30bc2e..898e0d4507 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -265,20 +265,25 @@ void * AddTempGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWORD flag
 

 void cli_AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline)

 {

-	ClcGroup *group;

-	ClcContact * cont;

 	pClcCacheEntry cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);

-	if (dat->IsMetaContactsEnabled && cacheEntry && cacheEntry->m_cache_nHiddenSubcontact) return;		//contact should not be added

-	if ( !dat->IsMetaContactsEnabled && cacheEntry && g_szMetaModuleName && !mir_strcmp(cacheEntry->m_cache_cszProto,g_szMetaModuleName)) return;

+	if (dat->IsMetaContactsEnabled && cacheEntry && cacheEntry->m_cache_nHiddenSubcontact)

+		return;		//contact should not be added

+

+	if ( !dat->IsMetaContactsEnabled && cacheEntry && g_szMetaModuleName && !mir_strcmp(cacheEntry->m_cache_cszProto,g_szMetaModuleName))

+		return;

+

 	corecli.pfnAddContactToTree(hwnd,dat,hContact,updateTotalCount,checkHideOffline);

-	if (FindItem(hwnd,dat,hContact,&cont,&group,NULL,FALSE))

+

+	ClcGroup *group;

+	ClcContact *cont;

+	if ( FindItem(hwnd,dat,hContact,&cont,&group,NULL,FALSE))

 		_LoadDataToContact(cont, group, dat, hContact);

 	return;

 }

 

 void cli_DeleteItemFromTree(HWND hwnd,HANDLE hItem)

 {

-	struct ClcData *dat = (struct ClcData *) GetWindowLongPtr(hwnd, 0);

+	ClcData *dat = (struct ClcData *) GetWindowLongPtr(hwnd, 0);

 	ClearRowByIndexCache();

 	corecli.pfnDeleteItemFromTree(hwnd, hItem);