6 files changed, 5 insertions, 6 deletions
diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 7893c21309..bd22ddca47 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -133,7 +133,7 @@ public:
 	BOOL        m_autoSplit;
 	BOOL        m_FlashOnMTN;
 	DWORD       dwThreadID;
-	HANDLE      m_hMessageWindowList, hUserPrefsWindowList;
+	MWindowList m_hMessageWindowList, hUserPrefsWindowList;
 	HMENU       m_MenuBar;
 	COLORREF    m_ipBackgroundGradient;
 	COLORREF    m_ipBackgroundGradientHigh;
diff --git a/plugins/TabSRMM/src/mim.h b/plugins/TabSRMM/src/mim.h
index 99a2f80cd5..4fc142756b 100644
--- a/plugins/TabSRMM/src/mim.h
+++ b/plugins/TabSRMM/src/mim.h
@@ -193,7 +193,7 @@ public:
 	static	int MessageEventAdded(WPARAM wParam, LPARAM lParam);
 
 public:
-	HANDLE m_hMessageWindowList;
+	MWindowList m_hMessageWindowList;
 
 	// various function pointers
 	static PDTTE  m_pfnDrawThemeTextEx;
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index e931c1b9d0..49a7a70c33 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -4,7 +4,7 @@ HANDLE hTypingNotify;
 
 static HGENMENU hDisableMenu = NULL;
 
-static HANDLE hPopupsList = NULL;
+static MWindowList hPopupsList = NULL;
 
 static BYTE   OnePopup;
 static BYTE   ShowMenu;
diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index ced9ac7c04..a5a2c76604 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -136,7 +136,6 @@ static INT_PTR CALLBACK DlgProcUserPrefs(HWND hwndDlg, UINT msg, WPARAM wParam,
 			DWORD	*pdwActionToTake = (DWORD *)lParam;
 			unsigned int iOldIEView = 0;
 			HWND	hWnd = M.FindWindow(hContact);
-			DWORD	sCodePage = M.GetDword(hContact, "ANSIcodepage", 0);
 			BYTE	bOldInfoPanel = M.GetByte(hContact, "infopanel", 0);
 
 			if (hWnd) {
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index f69a4c8c2b..d7be4d2221 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -52,7 +52,7 @@ static TRTFColorTable _rtf_ctable[] =
 int				Utils::rtf_ctable_size = 0;
 TRTFColorTable* Utils::rtf_ctable = 0;
 
-HANDLE			CWarning::hWindowList = 0;
+MWindowList CWarning::hWindowList = 0;
 
 static TCHAR *w_bbcodes_begin[] = { _T("[b]"), _T("[i]"), _T("[u]"), _T("[s]"), _T("[color=") };
 static TCHAR *w_bbcodes_end[] = { _T("[/b]"), _T("[/i]"), _T("[/u]"), _T("[/s]"), _T("[/color]") };
diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h
index 3815595ffa..6db72b6c26 100644
--- a/plugins/TabSRMM/src/utils.h
+++ b/plugins/TabSRMM/src/utils.h
@@ -179,7 +179,7 @@ private:
 	static __int64 getMask(); // get bit mask for disabled message classes
 
 private:
-	static	HANDLE			hWindowList;
+	static MWindowList hWindowList;
 };
 
 #endif /* __UTILS_H */