R.I.P m_clui.h, you helped us alot

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

56 files changed, 106 insertions, 200 deletions

diff --git a/plugins/AdvaImg/src/main.cpp b/plugins/AdvaImg/src/main.cpp
index 87340ddd2c..b9be9dcb58 100644
--- a/plugins/AdvaImg/src/main.cpp
+++ b/plugins/AdvaImg/src/main.cpp
@@ -28,8 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <commdlg.h>

 #include <malloc.h>

 

-#include <m_clui.h>

-

 #include <m_imgsrvc.h>

 

 #include "newpluginapi.h"

diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h
index 8e000393b4..ade5b17c78 100644
--- a/plugins/Alarms/src/stdafx.h
+++ b/plugins/Alarms/src/stdafx.h
@@ -16,7 +16,6 @@
 #include <m_popup.h>

 #include <m_clist.h>

 #include <m_idle.h>

-#include <m_clui.h>

 #include <m_cluiframes.h>

 #include <m_fontservice.h>

 #include <m_icolib.h>

diff --git a/plugins/AutoShutdown/src/stdafx.h b/plugins/AutoShutdown/src/stdafx.h
index 2bff3bea17..be9415d830 100644
--- a/plugins/AutoShutdown/src/stdafx.h
+++ b/plugins/AutoShutdown/src/stdafx.h
@@ -42,7 +42,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include <newpluginapi.h>

 #include <m_database.h>

-#include <m_clui.h>

 #include <m_langpack.h>

 #include <m_skin.h>

 #include <m_protosvc.h>

diff --git a/plugins/BASS_interface/src/stdafx.h b/plugins/BASS_interface/src/stdafx.h
index 93059bd003..f09b58d36c 100644
--- a/plugins/BASS_interface/src/stdafx.h
+++ b/plugins/BASS_interface/src/stdafx.h
@@ -12,7 +12,6 @@ Copyright (C) 2010, 2011 tico-tico
 #include <m_database.h>

 #include <m_options.h>

 #include <win2k.h>

-#include <m_clui.h>

 #include <m_clist.h>

 #include <m_cluiframes.h>

 #include <m_fontservice.h>

diff --git a/plugins/Clist_blind/src/stdafx.h b/plugins/Clist_blind/src/stdafx.h
index 1d3c397236..a908c1c97d 100644
--- a/plugins/Clist_blind/src/stdafx.h
+++ b/plugins/Clist_blind/src/stdafx.h
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include <newpluginapi.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_database.h>

 #include <m_langpack.h>

 #include <m_options.h>

diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp
index 6801632ee6..61c606bd4c 100644
--- a/plugins/Clist_modern/src/groupmenu.cpp
+++ b/plugins/Clist_modern/src/groupmenu.cpp
@@ -22,7 +22,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_clc.h"

 

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 30be3a17a7..a4183bc8f2 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -53,13 +53,6 @@ static ClcContact *hitcontact = NULL;
 HANDLE hSkinFolder;

 TCHAR SkinsFolder[MAX_PATH];

 

-static int clcHookSmileyAddOptionsChanged(WPARAM wParam, LPARAM lParam);

-static int clcHookIconsChanged(WPARAM wParam, LPARAM lParam);

-static int clcHookBkgndConfigChanged(WPARAM wParam, LPARAM lParam);

-static int clcProceedDragToScroll(HWND hwnd, int Y);

-static int clcExitDragToScroll();

-

-

 int ReloadSkinFolder(WPARAM, LPARAM)

 {

 	FoldersGetCustomPathT(hSkinFolder, SkinsFolder, _countof(SkinsFolder), _T(DEFAULT_SKIN_FOLDER));

@@ -205,19 +198,16 @@ static int clcExitDragToScroll()
 

 static int clcProceedDragToScroll(HWND hwnd, int Y)

 {

-	int pos, dy;

 	if (!IsDragToScrollMode) return 0;

 	if (GetCapture() != hwnd) clcExitDragToScroll();

-	dy = StartDragPos - Y;

-	pos = StartScrollPos + dy;

+	int dy = StartDragPos - Y;

+	int pos = StartScrollPos + dy;

 	if (pos < 0)

 		pos = 0;

 	SendMessage(hwnd, WM_VSCROLL, MAKEWPARAM(SB_THUMBTRACK, pos), 0);

 	return 1;

 }

 

-

-

 static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const TCHAR *text, int prefixOk, BOOL fSearchUp)

 {

 	ClcGroup *group = &dat->list;

@@ -418,6 +408,7 @@ static LRESULT clcOnChar(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARA
 	}

 	return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 }

+

 static LRESULT clcOnPaint(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	if (IsWindowVisible(hwnd)) {

@@ -638,14 +629,14 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR
 		return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 

 	case TIMERID_INVALIDATE:

-	{

-		time_t cur_time = (time(NULL) / 60);

-		if (cur_time != dat->last_tick_time) {

-			CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

-			dat->last_tick_time = cur_time;

+		{

+			time_t cur_time = (time(NULL) / 60);

+			if (cur_time != dat->last_tick_time) {

+				CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+				dat->last_tick_time = cur_time;

+			}

 		}

-	}

-	return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

+		return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 

 	case TIMERID_SUBEXPAND:

 		KillTimer(hwnd, TIMERID_SUBEXPAND);

@@ -691,7 +682,6 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR
 	}

 }

 

-

 static LRESULT clcOnActivate(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	TRACE("clcOnActivate\n");

@@ -751,6 +741,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 	int hit = cliHitTest(hwnd, dat, (short)LOWORD(lParam), (short)HIWORD(lParam), &contact, &group, &hitFlags);

 	if (GetFocus() != hwnd)

 		SetFocus(hwnd);

+

 	if (hit != -1 && !(hitFlags & CLCHT_NOWHERE)) {

 		if (hit == dat->selection && hitFlags & CLCHT_ONITEMLABEL && dat->exStyle & CLS_EX_EDITLABELS) {

 			if (!(dat->dragStage & DRAGSTAGEF_SKIPRENAME)) {

@@ -1600,8 +1591,8 @@ static int clcHookModulesLoaded(WPARAM, LPARAM)
 

 	if (!ServiceExists(MS_AV_GETAVATARBITMAP))

 		MessageBox(NULL,

-		TranslateT("Clist Modern requires AVS plugin to be present. Install it using PluginUpdater or download from http://wiki.miranda-ng.org/Download"),

-		TranslateT("Error loading plugin"), MB_ICONERROR | MB_OK);

+			TranslateT("Clist Modern requires AVS plugin to be present. Install it using PluginUpdater or download from http://wiki.miranda-ng.org/Download"),

+			TranslateT("Error loading plugin"), MB_ICONERROR | MB_OK);

 

 	HookEvent(ME_AV_AVATARCHANGED, clcHookAvatarChanged);

 

@@ -1802,8 +1793,7 @@ int ClcEnterDragToScroll(HWND hwnd, int Y)
 */

 LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-

-#define CASE_MSG_RET(msg, handler) case msg: return handler(dat, hwnd, msg, wParam, lParam);

+	#define CASE_MSG_RET(msg, handler) case msg: return handler(dat, hwnd, msg, wParam, lParam);

 

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

 

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 78bd96b475..bca83d69db 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 #include "modern_clcpaint.h"

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index a0dc3834c5..027da4c262 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"

 #include "modern_clist.h"

 #include "m_genmenu.h"

-#include "m_clui.h"

 #include "modern_commonprototypes.h"

 

 int LoadFavoriteContactMenu();

diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 2a8c81e727..29dcd0b5de 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index d03ff525b9..3b713f0f01 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include <m_clui.h>

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 #include "modern_statusbar.h"

diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp
index 32507cc395..e43ede7807 100644
--- a/plugins/Clist_modern/src/modern_cluiservices.cpp
+++ b/plugins/Clist_modern/src/modern_cluiservices.cpp
@@ -40,14 +40,8 @@ void cliCluiProtocolStatusChanged(int, const char * proto)
 		pcli->pfnTrayIconUpdateBase(proto);

 }

 

-static INT_PTR MetaSupportCheck(WPARAM, LPARAM)

-{

-	return 1;

-}

-

 int CLUIServices_LoadModule(void)

 {

-	CreateServiceFunction(MS_CLUI_METASUPPORT, MetaSupportCheck);

 	CreateServiceFunction(MS_CLIST_GETSTATUSMODE, CListTray_GetGlobalStatus);

 	return 0;

 }

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 3260689079..24cdcb0a96 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index a726afc1a6..a48543b1b1 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1216,8 +1216,6 @@ void CreateViewModeFrame()
 	ApplyViewMode(NULL); //Apply last selected view mode

 }

 

-const char *MakeVariablesString(const char *src, const char *UIN);

-

 void ApplyViewMode(const char *Name, bool onlySelector)

 {

 	char szSetting[256];

diff --git a/plugins/Clist_nicer/src/clist.h b/plugins/Clist_nicer/src/clist.h
index d1a4e93d6b..89462cbc5f 100644
--- a/plugins/Clist_nicer/src/clist.h
+++ b/plugins/Clist_nicer/src/clist.h
@@ -22,7 +22,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-void LoadContactTree(void);

 int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON *phIcon);

 HTREEITEM GetTreeItemByHContact(MCONTACT hContact);

 void SortContacts(void);

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index 0e41b66e01..9496f8b98b 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -24,9 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "stdafx.h"

 

-void LoadContactTree(void);

-void SortContacts(void);

-

 static int opt_gen_opts_changed = 0;

 

 static void __setFlag(DWORD dwFlag, int iMode)

@@ -179,7 +176,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				HideShowNotifyFrame();

 				SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0);

 				SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0);

-				LoadContactTree(); /* this won't do job properly since it only really works when changes happen */

+				pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */

 				pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

 				PostMessage(pcli->hwndContactList, CLUIINTM_REDRAW, 0, 0);

 

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 0aff338a8a..4da1543aff 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -66,6 +66,7 @@ extern LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPA
 extern HANDLE hNotifyFrame;
 
 int LoadCluiServices(void);
+void MF_InitCheck(void);

 void InitGroupMenus();
 void FS_RegisterFonts();
 void LoadExtraIconModule();
@@ -1951,6 +1952,8 @@ void LoadCLUIModule(void)
 			TranslateT("Warning"), MB_OK | MB_ICONWARNING);
 		db_unset(NULL, "CLUI", "FloaterMode");
 	}
+	
+	MF_InitCheck();
 }
 
 void OnCreateClc()
diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp
index 3e2b638ab7..5a1ed61b96 100644
--- a/plugins/Clist_nicer/src/cluiopts.cpp
+++ b/plugins/Clist_nicer/src/cluiopts.cpp
@@ -24,9 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "stdafx.h"

 

-extern HANDLE hExtraImageApplying;

-extern SIZE g_oldSize;

-extern POINT g_oldPos;

 extern COLORREF g_CLUISkinnedBkColorRGB;

 

 static int opt_clui_changed = 0;

@@ -37,85 +34,82 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 {

 	switch (msg) {

 	case WM_INITDIALOG:

-		{

-			opt_clui_changed = 0;

-			TranslateDialogDefault(hwndDlg);

-			CheckDlgButton(hwndDlg, IDC_BRINGTOFRONT, cfg::getByte("CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_ALWAYSHIDEONTASKBAR, cfg::getByte("CList", "AlwaysHideOnTB", 1) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_ONTOP, cfg::getByte("CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_SHOWMAINMENU, cfg::getByte("CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_CLIENTDRAG, cfg::getByte("CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_FADEINOUT, cfg::dat.fadeinout ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_AUTOSIZE, cfg::dat.autosize ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_DROPSHADOW, cfg::getByte("CList", "WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_ONDESKTOP, cfg::getByte("CList", "OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED);

-

-			SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Title bar"));

-			SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Tool Window"));

-			SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Thin border"));

-			SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("No border"));

-			SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_SETCURSEL, cfg::getByte("CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW), 0);

-

-			SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETRANGE, 0, MAKELONG(100, 0));

-			SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETPOS, 0, cfg::getByte("CLUI", "MaxSizeHeight", 75));

-

-			SendDlgItemMessage(hwndDlg, IDC_CLIPBORDERSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));

-			SendDlgItemMessage(hwndDlg, IDC_CLIPBORDERSPIN, UDM_SETPOS, 0, cfg::dat.bClipBorder);

-

-			SendDlgItemMessage(hwndDlg, IDC_CLEFTSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

-			SendDlgItemMessage(hwndDlg, IDC_CRIGHTSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

-			SendDlgItemMessage(hwndDlg, IDC_CTOPSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

-			SendDlgItemMessage(hwndDlg, IDC_CBOTTOMSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

-

-			SendDlgItemMessage(hwndDlg, IDC_CLEFTSPIN, UDM_SETPOS, 0, cfg::dat.bCLeft - (cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? 3 : 0));

-			SendDlgItemMessage(hwndDlg, IDC_CRIGHTSPIN, UDM_SETPOS, 0, cfg::dat.bCRight - (cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? 3 : 0));

-			SendDlgItemMessage(hwndDlg, IDC_CTOPSPIN, UDM_SETPOS, 0, cfg::dat.bCTop);

-			SendDlgItemMessage(hwndDlg, IDC_CBOTTOMSPIN, UDM_SETPOS, 0, cfg::dat.bCBottom);

-

-			CheckDlgButton(hwndDlg, IDC_AUTOSIZEUPWARD, cfg::getByte("CLUI", "AutoSizeUpward", 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_AUTOHIDE, cfg::getByte("CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-			SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETRANGE, 0, MAKELONG(900, 1));

-			SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETPOS, 0, MAKELONG(cfg::getWord("CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0));

-			Utils::enableDlgControl(hwndDlg, IDC_HIDETIME, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

-			Utils::enableDlgControl(hwndDlg, IDC_HIDETIMESPIN, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

-			Utils::enableDlgControl(hwndDlg, IDC_STATIC01, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

-			if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)) {

-				Utils::enableDlgControl(hwndDlg, IDC_STATIC21, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_STATIC22, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_MAXSIZEHEIGHT, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_MAXSIZESPIN, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_AUTOSIZEUPWARD, FALSE);

-			} {

-				DBVARIANT dbv;

-				if (!cfg::getTString(NULL, "CList", "TitleText", &dbv)) {

-					SetDlgItemText(hwndDlg, IDC_TITLETEXT, dbv.ptszVal);

-					db_free(&dbv);

-				}

-				else

-					SetDlgItemTextA(hwndDlg, IDC_TITLETEXT, MIRANDANAME);

-			}

-

-			CheckDlgButton(hwndDlg, IDC_TRANSPARENT, cfg::dat.isTransparent ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_FULLTRANSPARENT, cfg::dat.bFullTransparent ? BST_CHECKED : BST_UNCHECKED);

+		TranslateDialogDefault(hwndDlg);

 

-			if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) {

-				Utils::enableDlgControl(hwndDlg, IDC_STATIC11, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_STATIC12, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_TRANSACTIVE, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_TRANSINACTIVE, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_ACTIVEPERC, FALSE);

-				Utils::enableDlgControl(hwndDlg, IDC_INACTIVEPERC, FALSE);

-			}

-			SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255));

-			SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255));

-			SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETPOS, TRUE, cfg::dat.alpha);

-			SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_SETPOS, TRUE, cfg::dat.autoalpha);

-			SendMessage(hwndDlg, WM_HSCROLL, 0x12345678, 0);

-

-			CheckDlgButton(hwndDlg, IDC_ROUNDEDBORDER, cfg::dat.dwFlags & CLUI_FRAME_ROUNDEDFRAME ? BST_CHECKED : BST_UNCHECKED);

-			SendDlgItemMessage(hwndDlg, IDC_FRAMEGAPSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));

-			SendDlgItemMessage(hwndDlg, IDC_FRAMEGAPSPIN, UDM_SETPOS, 0, (LPARAM)cfg::dat.gapBetweenFrames);

+		opt_clui_changed = 0;

+		CheckDlgButton(hwndDlg, IDC_BRINGTOFRONT, cfg::getByte("CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_ALWAYSHIDEONTASKBAR, cfg::getByte("CList", "AlwaysHideOnTB", 1) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_ONTOP, cfg::getByte("CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_SHOWMAINMENU, cfg::getByte("CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_CLIENTDRAG, cfg::getByte("CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_FADEINOUT, cfg::dat.fadeinout ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_AUTOSIZE, cfg::dat.autosize ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_DROPSHADOW, cfg::getByte("CList", "WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_ONDESKTOP, cfg::getByte("CList", "OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED);

+

+		SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Title bar"));

+		SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Tool Window"));

+		SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Thin border"));

+		SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("No border"));

+		SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_SETCURSEL, cfg::getByte("CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW), 0);

+

+		SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETRANGE, 0, MAKELONG(100, 0));

+		SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETPOS, 0, cfg::getByte("CLUI", "MaxSizeHeight", 75));

+

+		SendDlgItemMessage(hwndDlg, IDC_CLIPBORDERSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));

+		SendDlgItemMessage(hwndDlg, IDC_CLIPBORDERSPIN, UDM_SETPOS, 0, cfg::dat.bClipBorder);

+

+		SendDlgItemMessage(hwndDlg, IDC_CLEFTSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

+		SendDlgItemMessage(hwndDlg, IDC_CRIGHTSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

+		SendDlgItemMessage(hwndDlg, IDC_CTOPSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

+		SendDlgItemMessage(hwndDlg, IDC_CBOTTOMSPIN, UDM_SETRANGE, 0, MAKELONG(255, 0));

+

+		SendDlgItemMessage(hwndDlg, IDC_CLEFTSPIN, UDM_SETPOS, 0, cfg::dat.bCLeft - (cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? 3 : 0));

+		SendDlgItemMessage(hwndDlg, IDC_CRIGHTSPIN, UDM_SETPOS, 0, cfg::dat.bCRight - (cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? 3 : 0));

+		SendDlgItemMessage(hwndDlg, IDC_CTOPSPIN, UDM_SETPOS, 0, cfg::dat.bCTop);

+		SendDlgItemMessage(hwndDlg, IDC_CBOTTOMSPIN, UDM_SETPOS, 0, cfg::dat.bCBottom);

+

+		CheckDlgButton(hwndDlg, IDC_AUTOSIZEUPWARD, cfg::getByte("CLUI", "AutoSizeUpward", 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_AUTOHIDE, cfg::getByte("CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETRANGE, 0, MAKELONG(900, 1));

+		SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETPOS, 0, MAKELONG(cfg::getWord("CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0));

+		Utils::enableDlgControl(hwndDlg, IDC_HIDETIME, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

+		Utils::enableDlgControl(hwndDlg, IDC_HIDETIMESPIN, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

+		Utils::enableDlgControl(hwndDlg, IDC_STATIC01, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

+		if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)) {

+			Utils::enableDlgControl(hwndDlg, IDC_STATIC21, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_STATIC22, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_MAXSIZEHEIGHT, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_MAXSIZESPIN, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_AUTOSIZEUPWARD, FALSE);

+		}

+		{

+			ptrT tszTitle(db_get_tsa(NULL, "CList", "TitleText"));

+			if (tszTitle != NULL)

+				SetDlgItemText(hwndDlg, IDC_TITLETEXT, tszTitle);

+			else

+				SetDlgItemTextA(hwndDlg, IDC_TITLETEXT, MIRANDANAME);

+		}

+		CheckDlgButton(hwndDlg, IDC_TRANSPARENT, cfg::dat.isTransparent ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_FULLTRANSPARENT, cfg::dat.bFullTransparent ? BST_CHECKED : BST_UNCHECKED);

+

+		if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) {

+			Utils::enableDlgControl(hwndDlg, IDC_STATIC11, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_STATIC12, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_TRANSACTIVE, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_TRANSINACTIVE, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_ACTIVEPERC, FALSE);

+			Utils::enableDlgControl(hwndDlg, IDC_INACTIVEPERC, FALSE);

 		}

+		SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255));

+		SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255));

+		SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETPOS, TRUE, cfg::dat.alpha);

+		SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_SETPOS, TRUE, cfg::dat.autoalpha);

+		SendMessage(hwndDlg, WM_HSCROLL, 0x12345678, 0);

+

+		CheckDlgButton(hwndDlg, IDC_ROUNDEDBORDER, cfg::dat.dwFlags & CLUI_FRAME_ROUNDEDFRAME ? BST_CHECKED : BST_UNCHECKED);

+		SendDlgItemMessage(hwndDlg, IDC_FRAMEGAPSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0));

+		SendDlgItemMessage(hwndDlg, IDC_FRAMEGAPSPIN, UDM_SETPOS, 0, (LPARAM)cfg::dat.gapBetweenFrames);

 		return TRUE;

 

 	case WM_COMMAND:

@@ -239,12 +233,11 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			else

 				SetMenu(pcli->hwndContactList, pcli->hMenuMain);

 

-			{

-				TCHAR title[256];

-				GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, _countof(title));

-				cfg::writeTString(NULL, "CList", "TitleText", title);

-				SetWindowText(pcli->hwndContactList, title);

-			}

+			TCHAR title[256];

+			GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, _countof(title));

+			cfg::writeTString(NULL, "CList", "TitleText", title);

+			SetWindowText(pcli->hwndContactList, title);

+

 			cfg::dat.dwFlags = IsDlgButtonChecked(hwndDlg, IDC_ROUNDEDBORDER) ? cfg::dat.dwFlags | CLUI_FRAME_ROUNDEDFRAME : cfg::dat.dwFlags & ~CLUI_FRAME_ROUNDEDFRAME;

 			cfg::writeByte("CLUI", "AutoSize", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));

 

@@ -348,6 +341,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			Utils::enableDlgControl(hwndDlg, IDC_SKINBACKGROUND, FALSE);

 		}

 		return TRUE;

+

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_SHOWSBAR) {

 			Utils::enableDlgControl(hwndDlg, IDC_SHOWICON, IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR));

@@ -363,6 +357,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 		opt_sbar_changed = 1;

 		break;

+

 	case WM_NOTIFY:

 		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index 26dc01f498..382ae75e70 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -124,31 +124,14 @@ void MF_UpdateThread(LPVOID)
 	CloseHandle(hEvent);

 }

 

-void LoadContactTree(void)

+void MF_InitCheck(void)

 {

-	int i, status, hideOffline;

 	BYTE bMsgFrequency = cfg::getByte("CList", "fhistdata", 0);

-

-	CallService(MS_CLUI_LISTBEGINREBUILD, 0, 0);

-	for (i = 1;; i++) {

-		if (Clist_GroupGetName(i, NULL) == NULL)

-			break;

-		CallService(MS_CLUI_GROUPADDED, i, 0);

-	}

-

-	hideOffline = cfg::getByte("CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);

-

-	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		status = GetContactStatus(hContact);

-		if ((!hideOffline || status != ID_STATUS_OFFLINE) && !CLVM_GetContactHiddenStatus(hContact, NULL, NULL))

-			pcli->pfnChangeContactIcon(hContact, IconFromStatusMode(GetContactProto(hContact), status, hContact, NULL));

-

-		// build initial data for message frequency

-		if (!bMsgFrequency)

+	if (!bMsgFrequency) {

+		for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 			MF_CalcFrequency(hContact, 100, 0);

+		cfg::writeByte("CList", "fhistdata", 1);

 	}

-	cfg::writeByte("CList", "fhistdata", 1);

-	CallService(MS_CLUI_LISTENDREBUILD, 0, 0);

 }

 

 DWORD INTSORT_GetLastMsgTime(MCONTACT hContact)

@@ -281,6 +264,6 @@ int SetHideOffline(WPARAM wParam, LPARAM)
 	}

 	SetButtonStates();

 	ClcSetButtonState(IDC_TBHIDEOFFLINE, newVal);

-	LoadContactTree();

+	pcli->pfnLoadContactTree();

 	return 0;

 }

diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index ece4a96e3f..218a20d758 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -198,7 +198,6 @@ extern "C" int __declspec(dllexport) CListInitialise()
 	pcli->pfnGetRowTotalHeight = RowHeight::getTotalHeight;

 	pcli->pfnGetWindowVisibleState = GetWindowVisibleState;

 	pcli->pfnHitTest = HitTest;

-	pcli->pfnLoadContactTree = LoadContactTree;

 	pcli->pfnOnCreateClc = OnCreateClc;

 	pcli->pfnPaintClc = PaintClc;

 	pcli->pfnRebuildEntireList = RebuildEntireList;

diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index 6f792be800..48091ba4eb 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -50,7 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_addcontact.h>

 #include <m_timezones.h>

 #include <m_cluiframes.h>

-#include <m_clui.h>

 #include <m_icolib.h>

 #include <m_fontservice.h>

 #include <m_xstatus.h>

diff --git a/plugins/CmdLine/src/stdafx.h b/plugins/CmdLine/src/stdafx.h
index 2394d55fa8..527f179566 100644
--- a/plugins/CmdLine/src/stdafx.h
+++ b/plugins/CmdLine/src/stdafx.h
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_database.h"

 #include "m_clist.h"

 #include "m_clistint.h"

-#include "m_clui.h"

 #include "m_contacts.h"

 #include "m_langpack.h"

 #include "m_protosvc.h"

diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h
index a6e99bc3d6..1e8a725838 100644
--- a/plugins/ContactsPlus/src/stdafx.h
+++ b/plugins/ContactsPlus/src/stdafx.h
@@ -35,7 +35,6 @@
 #include "m_clist.h"

 #include "m_clistint.h"

 #include "m_clc.h"

-#include "m_clui.h"

 #include "m_addcontact.h"

 #include "m_history.h"

 #include "m_userinfo.h"

diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index a9f5d33b7f..26e42a773b 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -361,7 +361,6 @@ void importSettings(MCONTACT hContact, char *utf8)
 						continue;

 

 					MGROUP GroupHandle = Clist_GroupCreate(0, GroupName);

-					CallService(MS_CLUI_GROUPADDED, GroupHandle, 0);

 					Clist_GroupSetExpanded(GroupHandle, true);

 				}

 

diff --git a/plugins/DbEditorPP/src/stdafx.h b/plugins/DbEditorPP/src/stdafx.h
index cc345714a5..7049c908e4 100644
--- a/plugins/DbEditorPP/src/stdafx.h
+++ b/plugins/DbEditorPP/src/stdafx.h
@@ -21,7 +21,6 @@
 #include <newpluginapi.h>

 #include <m_utils.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_skin.h>

 #include <m_langpack.h>

 #include <m_database.h>

diff --git a/plugins/ExternalAPI/m_skin_eng.h b/plugins/ExternalAPI/m_skin_eng.h
index b80b02e319..a1b8b6cf55 100644
--- a/plugins/ExternalAPI/m_skin_eng.h
+++ b/plugins/ExternalAPI/m_skin_eng.h
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef M_ske_H_INC

 #define M_ske_H_INC

 

-#include <m_clui.h>

 #include <m_clistint.h>

 

 /*defaults*/

diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
index fbad88c334..af3decec3f 100644
--- a/plugins/FloatingContacts/src/stdafx.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -15,7 +15,6 @@
 #include <m_protosvc.h>

 #include <m_database.h>

 #include <m_message.h>

-#include <m_clui.h>

 #include <m_options.h>

 #include <m_clist.h>

 #include <m_hotkeys.h>

diff --git a/plugins/GmailNotifier/src/stdafx.h b/plugins/GmailNotifier/src/stdafx.h
index ef1e8bc67b..10623f9466 100644
--- a/plugins/GmailNotifier/src/stdafx.h
+++ b/plugins/GmailNotifier/src/stdafx.h
@@ -6,7 +6,6 @@
 

 #include "newpluginapi.h"

 #include "m_clist.h"

-#include "m_clui.h"

 #include "m_skin.h"

 #include "m_langpack.h"

 #include "m_database.h"

diff --git a/plugins/HTTPServer/src/Glob.h b/plugins/HTTPServer/src/Glob.h
index 2b5fe8e8c3..2b22af38a9 100644
--- a/plugins/HTTPServer/src/Glob.h
+++ b/plugins/HTTPServer/src/Glob.h
@@ -32,7 +32,6 @@ using namespace std;
 #include <m_database.h>

 #include <m_clist.h>

 #include <m_langpack.h>

-#include <m_clui.h>

 #include <m_userinfo.h>

 #include <m_netlib.h>

 #include <m_message.h>

diff --git a/plugins/HistoryPlusPlus/GlobalSearch.pas b/plugins/HistoryPlusPlus/GlobalSearch.pas
index 5454de3ffe..a868423ead 100644
--- a/plugins/HistoryPlusPlus/GlobalSearch.pas
+++ b/plugins/HistoryPlusPlus/GlobalSearch.pas
@@ -530,11 +530,9 @@ begin
     else

     begin

       li.Caption := LastAddedContact.Name;

-      // li.Caption := CurContactName;

       Inc(ContactsFound);

     end;

-    li.ImageIndex := CallService(MS_CLIST_GETCONTACTICON, CurContact, 0);

-    // meTest.Lines.Add(CurContactName+' icon is '+IntToStr(CallService(MS_CLIST_GETCONTACTICON,CurContact,0)));

+    li.ImageIndex := cli^.pfnGetContactIcon(CurContact);

     li.Data := Pointer(CurContact);

   end;

 

diff --git a/plugins/HistoryStats/src/stdafx.h b/plugins/HistoryStats/src/stdafx.h
index 6533dd30e7..8646a67c1e 100644
--- a/plugins/HistoryStats/src/stdafx.h
+++ b/plugins/HistoryStats/src/stdafx.h
@@ -39,7 +39,6 @@
 #include <m_chat.h>        // not used

 #include <m_clc.h>

 #include <m_clist.h>

-#include <m_clui.h>        // not used

 #include <m_contacts.h>

 #include <m_database.h>

 #include <m_email.h>       // not used

diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h
index 27cd7a4c92..7a5bf4242f 100644
--- a/plugins/ListeningTo/src/stdafx.h
+++ b/plugins/ListeningTo/src/stdafx.h
@@ -36,7 +36,6 @@ Boston, MA 02111-1307, USA.
 #include <m_clist.h>

 #include <m_options.h>

 #include <m_xstatus.h>

-#include <m_clui.h>

 #include <m_genmenu.h>

 #include <m_hotkeys.h>

 #include <m_extraicons.h>

diff --git a/plugins/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h
index cc23ddfb39..8f84e9a5ee 100644
--- a/plugins/MenuItemEx/src/stdafx.h
+++ b/plugins/MenuItemEx/src/stdafx.h
@@ -13,7 +13,6 @@
 #include <m_protosvc.h>

 #include <m_langpack.h>

 #include <m_file.h>

-#include <m_clui.h>

 #include <m_clist.h>

 #include <m_ignore.h>

 #include <m_icolib.h>

diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h
index e6df528c12..e1812a712d 100644
--- a/plugins/MirandaG15/src/StdAfx.h
+++ b/plugins/MirandaG15/src/StdAfx.h
@@ -26,7 +26,6 @@ using namespace std;
 #include <m_clist.h>

 #include <m_protocols.h>

 #include <m_skin.h>

-#include <m_clui.h>

 #include <m_chat.h>

 #include <m_idle.h>

 #include <m_metacontacts.h>

diff --git a/plugins/MyDetails/src/stdafx.h b/plugins/MyDetails/src/stdafx.h
index ca0b47d830..a425f1945b 100644
--- a/plugins/MyDetails/src/stdafx.h
+++ b/plugins/MyDetails/src/stdafx.h
@@ -33,7 +33,6 @@ Boston, MA 02111-1307, USA.
 #include <m_langpack.h>

 #include <m_contacts.h>

 #include <m_options.h>

-#include <m_clui.h>

 #include <m_fontservice.h>

 #include <m_avatars.h>

 #include <m_xstatus.h>

diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp
index 4cb37750c5..d003b7da23 100644
--- a/plugins/New_GPG/src/icons.cpp
+++ b/plugins/New_GPG/src/icons.cpp
@@ -68,13 +68,10 @@ void setSrmmIcon(MCONTACT h)
 		Srmm_ModifyIcon(hMC, &sid);

 }

 

-

 void RefreshContactListIcons() 

 {

-	CallService(MS_CLUI_LISTBEGINREBUILD,0,0);

-

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 		setClistIcon(hContact);

 

-	CallService(MS_CLUI_LISTENDREBUILD,0,0);

+	Clist_EndRebuild();

 }

diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h
index eb5e6ba6a3..2e8ad39177 100644
--- a/plugins/New_GPG/src/stdafx.h
+++ b/plugins/New_GPG/src/stdafx.h
@@ -59,7 +59,6 @@ using std::fstream;
 #include <m_database.h>
 #include <m_options.h>
 #include <m_langpack.h>
-#include <m_clui.h>
 #include <m_skin.h>
 #include <m_jabber.h>
 #include <m_icq.h>
diff --git a/plugins/Non-IM Contact/src/stdafx.h b/plugins/Non-IM Contact/src/stdafx.h
index 0c5cfc0992..dcacf5841c 100644
--- a/plugins/Non-IM Contact/src/stdafx.h
+++ b/plugins/Non-IM Contact/src/stdafx.h
@@ -32,7 +32,6 @@ struct DLGTEMPLATEEX
 

 #include <newpluginapi.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_skin.h>

 #include <m_langpack.h>

 #include <m_database.h>

diff --git a/plugins/Nudge/src/stdafx.h b/plugins/Nudge/src/stdafx.h
index f12cc9839b..b56db035a0 100644
--- a/plugins/Nudge/src/stdafx.h
+++ b/plugins/Nudge/src/stdafx.h
@@ -11,7 +11,6 @@
 #include <m_clist.h>			

 #include <m_langpack.h>	

 #include <m_popup.h>	

-#include <m_clui.h>

 #include <m_message.h>

 #include <m_ignore.h>

 #include <m_options.h>

diff --git a/plugins/Ping/src/stdafx.h b/plugins/Ping/src/stdafx.h
index bfa39fbd0c..87cdeeaf15 100644
--- a/plugins/Ping/src/stdafx.h
+++ b/plugins/Ping/src/stdafx.h
@@ -18,7 +18,6 @@
 #include <m_netlib.h>

 #include <m_database.h>

 #include <m_protosvc.h>

-#include <m_clui.h>

 #include <m_clist.h>

 #include <m_cluiframes.h>

 #include <m_fontservice.h>

diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h
index db8bbf6bee..bc6507a35f 100644
--- a/plugins/Popup/src/stdafx.h
+++ b/plugins/Popup/src/stdafx.h
@@ -62,7 +62,6 @@ http://miranda-ng.org/distr/
 

 #include <newpluginapi.h>

 #include <win2k.h>

-#include <m_clui.h>

 #include <m_clist.h>

 #include <m_options.h>

 #include <m_skin.h>

diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index fb97bf8bd3..2ba33197c8 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -45,7 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_langpack.h>

 #include <m_button.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_protosvc.h>

 #include <m_skin.h>

 #include <m_contacts.h>

diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.h b/plugins/StatusPlugins/StartupStatus/startupstatus.h
index 7088c7666c..f0cc1047a0 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.h
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.h
@@ -23,7 +23,6 @@
 #include <wininet.h>

 #include <shlobj.h>

 #include <m_options.h>

-#include <m_clui.h>

 #include <m_toptoolbar.h>

 #include "version.h"

 

diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 2a638c2f18..bee1a8f4f2 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -60,7 +60,6 @@
 #include <m_contacts.h>

 #include <m_icolib.h>

 #include <m_clc.h>

-#include <m_clui.h>

 #include <m_clist.h>

 #include <m_userinfo.h>

 #include <m_history.h>

diff --git a/plugins/TipperYM/src/stdafx.h b/plugins/TipperYM/src/stdafx.h
index d2758550ad..b0bd0ad7df 100644
--- a/plugins/TipperYM/src/stdafx.h
+++ b/plugins/TipperYM/src/stdafx.h
@@ -32,7 +32,6 @@ Boston, MA 02111-1307, USA.
 #include <m_awaymsg.h>

 #include <m_clist.h>

 #include <m_clc.h>

-#include <m_clui.h>

 #include <m_cluiframes.h>

 #include <m_database.h>

 #include <m_fontservice.h>

diff --git a/plugins/TooltipNotify/src/stdafx.h b/plugins/TooltipNotify/src/stdafx.h
index d8c21992e6..f1a20e5546 100644
--- a/plugins/TooltipNotify/src/stdafx.h
+++ b/plugins/TooltipNotify/src/stdafx.h
@@ -15,7 +15,6 @@
 #include <m_clist.h>

 #include <m_skin.h>

 #include <m_database.h>

-#include <m_clui.h>

 #include <m_ignore.h>

 #include <m_options.h>

 #include <m_protosvc.h>

diff --git a/plugins/TopToolBar/src/stdafx.h b/plugins/TopToolBar/src/stdafx.h
index 956053a9d2..85b32c1e60 100644
--- a/plugins/TopToolBar/src/stdafx.h
+++ b/plugins/TopToolBar/src/stdafx.h
@@ -11,7 +11,6 @@
 #include <m_database.h>

 #include <m_skin.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_cluiframes.h>

 #include <m_clc.h>

 #include <m_findadd.h>

diff --git a/plugins/TrafficCounter/src/stdafx.h b/plugins/TrafficCounter/src/stdafx.h
index b8e8bb1618..abeb7badd6 100644
--- a/plugins/TrafficCounter/src/stdafx.h
+++ b/plugins/TrafficCounter/src/stdafx.h
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_netlib.h>

 #include <m_langpack.h>

-#include <m_clui.h>

 #include <m_clc.h>

 #include <m_clist.h>

 #include <m_options.h>

diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp
index 811ea09749..abc7596ccf 100644
--- a/plugins/UserInfoEx/src/dlg_msgbox.cpp
+++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 

 #include "stdafx.h"

 #include <Commdlg.h>

-#include <m_clui.h>

 #include <m_skin.h>

 

 typedef struct _MSGPOPUPDATA

diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h
index 43675c5b5d..e6ce640603 100644
--- a/plugins/UserInfoEx/src/stdafx.h
+++ b/plugins/UserInfoEx/src/stdafx.h
@@ -50,7 +50,6 @@ using namespace std;
 

 #include <newpluginapi.h>

 #include <m_button.h>

-#include <m_clui.h>

 #include <m_clist.h>

 #include <m_database.h>

 #include <m_hotkeys.h>

diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index ef504b4e02..fba748c67e 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -39,7 +39,6 @@
 #include <m_contacts.h>

 #include <m_options.h>

 #include <m_icolib.h>

-#include <m_clui.h>

 #include <m_clc.h>

 #include <m_string.h>

 #include <m_metacontacts.h>

diff --git a/plugins/Weather/src/stdafx.h b/plugins/Weather/src/stdafx.h
index 658894e12a..a6b155d5f5 100644
--- a/plugins/Weather/src/stdafx.h
+++ b/plugins/Weather/src/stdafx.h
@@ -45,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_findadd.h>

 #include <m_button.h>

 #include <m_avatars.h>

-#include <m_clui.h>

 #include <m_clc.h>

 #include <m_fontservice.h>

 #include <m_skin_eng.h>

diff --git a/plugins/WebView/src/stdafx.h b/plugins/WebView/src/stdafx.h
index e2c5a0a728..99f90ed9e6 100644
--- a/plugins/WebView/src/stdafx.h
+++ b/plugins/WebView/src/stdafx.h
@@ -17,7 +17,6 @@
 #include <m_system.h>

 #include <m_clist.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_database.h>

 #include <m_protocols.h>

 #include <m_protosvc.h>

@@ -27,7 +26,6 @@
 #include <m_genmenu.h>

 #include <m_icolib.h>

 #include <m_options.h>

-#include <m_clui.h>

 #include <m_popup.h>

 #include <m_netlib.h>

 #include <m_langpack.h>

diff --git a/plugins/YAPP/src/stdafx.h b/plugins/YAPP/src/stdafx.h
index 26ec420cc1..f702b2b0e1 100644
--- a/plugins/YAPP/src/stdafx.h
+++ b/plugins/YAPP/src/stdafx.h
@@ -18,7 +18,6 @@
 #include <m_langpack.h>

 #include <m_options.h>

 #include <m_skin.h>

-#include <m_clui.h>

 #include <m_clist.h>

 #include <m_fontservice.h>

 #include <m_avatars.h>

diff --git a/plugins/ZeroSwitch/src/stdafx.h b/plugins/ZeroSwitch/src/stdafx.h
index 2531d2596b..f5502963ee 100644
--- a/plugins/ZeroSwitch/src/stdafx.h
+++ b/plugins/ZeroSwitch/src/stdafx.h
@@ -10,7 +10,6 @@
 

 #include <newpluginapi.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_skin.h>

 #include <m_langpack.h>

 

diff --git a/plugins/helpers/commonheaders.h b/plugins/helpers/commonheaders.h
index b7d7b74956..ea3062672d 100644
--- a/plugins/helpers/commonheaders.h
+++ b/plugins/helpers/commonheaders.h
@@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system.h>

 #include <m_database.h>

 #include <m_clc.h>

-#include <m_clui.h>

 #include <m_langpack.h>

 #include <m_clist.h>

 #include <m_clistint.h>