more unused stuff cleaned

5 files changed, 5 insertions, 14 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index d966dc78c8..ea5c91dcbc 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -287,7 +287,6 @@ type
 type

   PCLIST_INTERFACE = ^TCLIST_INTERFACE;

   TCLIST_INTERFACE = record

-    version         : int;

     hwndContactList : HWND;

     hwndContactTree : HWND;

     hwndStatus      : HWND;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index b06e57cbb9..274b563300 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -312,8 +312,6 @@ struct ClcCacheEntryBase
 

 struct CLIST_INTERFACE

 {

-	int version;

-

 	HWND hwndContactList, hwndContactTree, hwndStatus;

 	HMENU hMenuMain;

 	HMODULE hInst;

@@ -424,7 +422,7 @@ struct CLIST_INTERFACE
 	OBJLIST<MenuProto> *menuProtos;

 

 	int      currentDesiredStatusMode;

-	BOOL     bDisplayLocked, bAutoRebuild;

+	BOOL     bAutoRebuild;

 

 	/*************************************************************************************

 	 * version 5 additions (0.7.0.x) - tray icons

diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 1f75296eef..16a88ede50 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -135,7 +135,6 @@ static HRESULT SubclassClistInterface()
 	corecli = *pcli;

 

 	pcli->hInst = g_hInst;

-	pcli->bDisplayLocked = true;

 

 	pcli->pfnCreateCacheItem = cliCreateCacheItem;

 	pcli->pfnCheckCacheItem = cliCheckCacheItem;

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 0e454969f0..7c300e574a 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -58,8 +58,6 @@ static int fnIsVisibleContact(ClcCacheEntry*, ClcGroup*)
 

 void InitClistCore()

 {

-	cli.version = 6;

-	cli.bDisplayLocked = true;

 	cli.menuProtos = &g_menuProtos;

 

 	cli.pfnContactListControlWndProc = fnContactListControlWndProc;

diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp
index 466a8e3ff1..c3dd5a83e8 100644
--- a/src/mir_app/src/menu_clist.cpp
+++ b/src/mir_app/src/menu_clist.cpp
@@ -551,11 +551,8 @@ static INT_PTR StatusMenuExecService(WPARAM wParam, LPARAM)
 		wchar_t buf[256], *ptszName;

 		if (bIsLocked) {

 			pimi->mi.flags |= CMIF_CHECKED;

-			if (cli.bDisplayLocked) {

-				mir_snwprintf(buf, TranslateT("%s (locked)"), acc->tszAccountName);

-				ptszName = buf;

-			}

-			else ptszName = acc->tszAccountName;

+			mir_snwprintf(buf, TranslateT("%s (locked)"), acc->tszAccountName);

+			ptszName = buf;

 		}

 		else {

 			ptszName = acc->tszAccountName;

@@ -759,7 +756,7 @@ void RebuildMenuOrder(void)
 		mi.position = pos++;

 		mi.hIcon = ic = (HICON)CallProtoServiceInt(0, pa->szModuleName, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0);

 

-		if (pa->IsLocked() && cli.bDisplayLocked) {

+		if (pa->IsLocked()) {

 			mir_snwprintf(tbuf, TranslateT("%s (locked)"), pa->tszAccountName);

 			mi.name.w = tbuf;

 		}

@@ -783,7 +780,7 @@ void RebuildMenuOrder(void)
 		if (pa->IsLocked())

 			mi.flags |= CMIF_CHECKED;

 

-		if ((mi.flags & CMIF_CHECKED) && cli.bDisplayLocked) {

+		if ((mi.flags & CMIF_CHECKED)) {

 			mir_snwprintf(tbuf, TranslateT("%s (locked)"), pa->tszAccountName);

 			mi.name.w = tbuf;

 		}