- microkernel addded;

- version bumped to 0.92.2

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

3 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Clist_mw/clc.cpp b/plugins/Clist_mw/clc.cpp
index 4975eda998..d238f5a6bb 100644
--- a/plugins/Clist_mw/clc.cpp
+++ b/plugins/Clist_mw/clc.cpp
@@ -199,7 +199,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		if (hSelItem) {

 			struct ClcGroup *selgroup;

 			if (FindItem(hwnd,dat,hSelItem,&selcontact,&selgroup,NULL))

-				dat->selection = GetRowsPriorTo(&dat->list,selgroup,li.List_IndexOf((SortedList*)&selgroup->cl, selcontact));

+				dat->selection = GetRowsPriorTo(&dat->list,selgroup,List_IndexOf((SortedList*)&selgroup->cl, selcontact));

 			else

 				dat->selection = -1;

 		}

diff --git a/plugins/Clist_mw/clcidents.cpp b/plugins/Clist_mw/clcidents.cpp
index 1cc940db2b..58517fa8c0 100644
--- a/plugins/Clist_mw/clcidents.cpp
+++ b/plugins/Clist_mw/clcidents.cpp
@@ -87,16 +87,16 @@ pdisplayNameCacheEntry GetCLCFullCacheEntry(struct ClcData *dat,HANDLE hContact)
 

 	displayNameCacheEntry dnce;

 	dnce.hContact = hContact;

-	displayNameCacheEntry *pdnce = (displayNameCacheEntry*)li.List_Find(&dat->lCLCContactsCache,&dnce);

+	displayNameCacheEntry *pdnce = (displayNameCacheEntry*)List_Find(&dat->lCLCContactsCache,&dnce);

 	if (pdnce == NULL) {

 		pdnce = (displayNameCacheEntry*)mir_calloc(sizeof(displayNameCacheEntry));

 		pdnce->hContact = hContact;

 	

 		int idx;

-		li.List_GetIndex(&dat->lCLCContactsCache,pdnce,&idx);

-		li.List_Insert(&dat->lCLCContactsCache,pdnce,idx);

+		List_GetIndex(&dat->lCLCContactsCache,pdnce,&idx);

+		List_Insert(&dat->lCLCContactsCache,pdnce,idx);

 

-		displayNameCacheEntry *pdnce2 = (displayNameCacheEntry*)li.List_Find(&dat->lCLCContactsCache,&dnce);//for check

+		displayNameCacheEntry *pdnce2 = (displayNameCacheEntry*)List_Find(&dat->lCLCContactsCache,&dnce);//for check

 		if (pdnce2->hContact != pdnce->hContact)

 			return NULL;

 

diff --git a/plugins/Clist_mw/clistsettings.cpp b/plugins/Clist_mw/clistsettings.cpp
index 25206e86ba..fcfbb58992 100644
--- a/plugins/Clist_mw/clistsettings.cpp
+++ b/plugins/Clist_mw/clistsettings.cpp
@@ -53,8 +53,8 @@ void InitDisplayNameCache(SortedList *list)
 		displayNameCacheEntry *pdnce = (pdisplayNameCacheEntry)mir_calloc(sizeof(displayNameCacheEntry));

 		pdnce->hContact = hContact;

 		InvalidateDisplayNameCacheEntryByPDNE(hContact,pdnce,0);

-		li.List_GetIndex(list,pdnce,&idx);

-		li.List_Insert(list,pdnce,idx);

+		List_GetIndex(list,pdnce,&idx);

+		List_Insert(list,pdnce,idx);

 		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0);

 		i++;

 }	}

@@ -77,7 +77,7 @@ void FreeDisplayNameCache(SortedList *list)
 		mir_free(list->items[i]);

 	}

 	

-	li.List_Destroy(list);

+	List_Destroy(list);

 }

 

 void CheckPDNCE(ClcCacheEntryBase *_pdnce)