- added ChangeClientNotify

- CommonLibs finally became common ;) git-svn-id: http://svn.miranda-ng.org/main/trunk@118 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
author: George Hazan <george.hazan@gmail.com> 2012-05-21 15:17:41 +0000
committer: George Hazan <george.hazan@gmail.com> 2012-05-21 15:17:41 +0000
commit: 49f4cab93b2f50a8132c6b8c26f1535f4f9ebb63 (patch)
tree: e4513a951782643b319f5f286994481030abb450
parent: c44981c03b71364fc42125594447d142ed9ed442 (diff)
33 files changed, 2258 insertions, 107 deletions
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/ClientChangeNotify.cpp
new file mode 100644
index 0000000000..a829c80d65
--- /dev/null
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.cpp
@@ -0,0 +1,633 @@
+/*
+	ClientChangeNotify - Plugin for Miranda IM
+	Copyright (c) 2006-2008 Chervov Dmitry
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#define _DECL_DLLMAIN
+
+#include "Common.h"
+#include "Misc.h"
+#include "VersionNo.h"
+#include "m_message.h"
+#include "m_userinfo.h"
+#include "m_history.h"
+#include "m_protocols.h"
+#include "m_updater.h"
+#include "m_protosvc.h"
+#include "m_metacontacts.h"
+#include "m_icolib.h"
+#include "m_genmenu.h"
+#include "m_ContactSettings.h"
+
+HINSTANCE g_hInstance;
+HANDLE g_hMainThread;
+HANDLE g_hTogglePopupsMenuItem;
+PLUGINLINK *pluginLink;
+int hLangpack;
+MM_INTERFACE mmi;
+TMyArray<HANDLE> hHooks, hServices;
+COptPage *g_PreviewOptPage; // we need to show popup even for the NULL contact if g_PreviewOptPage is not NULL (used for popup preview)
+
+
+// my_make_version is required to break up #define PRODUCTVER from VersionNo.h
+DWORD my_make_version(const int a, const int b, const int c, const int d)
+{
+	return PLUGIN_MAKE_VERSION(a, b, c, d);
+}
+
+PLUGININFOEX pluginInfo = {
+	sizeof(PLUGININFOEX),
+	"ClientChangeNotify ("
+#ifdef _DEBUG
+	"DEBUG "
+#endif
+#ifdef _UNICODE
+	"Unicode"
+#else
+	"ANSI"
+#endif
+	")",
+	0, // see VersionNo.h
+	"ClientChangeNotify plugin for Miranda IM.  Build #"STRSPECIALBUILD" [ "__DATE__"  "__TIME__
+#ifdef _DEBUG
+	" DEBUG"
+#endif
+#ifdef _UNICODE
+	" Unicode"
+#else
+	" ANSI"
+#endif
+	" ]",
+	"Deathdemon",
+	"dchervov@yahoo.com",
+	"� 2006-2008 Chervov Dmitry",
+	"http://deathdemon.int.ru/",
+	UNICODE_AWARE,
+	0,
+#ifdef _UNICODE
+	{0xb68a8906, 0x748b, 0x435d, {0x93, 0xe, 0x21, 0xcc, 0x6e, 0x8f, 0x3b, 0x3f}}
+// {B68A8906-748B-435d-930E-21CC6E8F3B3F}
+#else
+	{0x4e8d06c6, 0xde4f, 0x4b72, {0x9c, 0x52, 0xc2, 0x78, 0x72, 0xed, 0x3, 0xb9}}
+// {4E8D06C6-DE4F-4b72-9C52-C27872ED03B9}
+#endif
+};
+
+PLUGININFO oldPluginInfo = {
+	sizeof(PLUGININFO),
+	pluginInfo.shortName,
+	pluginInfo.version,
+	pluginInfo.description,
+	pluginInfo.author,
+	pluginInfo.authorEmail,
+	pluginInfo.copyright,
+	pluginInfo.homepage,
+	pluginInfo.flags,
+	pluginInfo.replacesDefaultModule
+};
+
+BOOL WINAPI MyDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+	g_hInstance = hinstDLL;
+	return TRUE;
+}
+
+#define MIID_CLIENTCHANGENOTIFY {0xe9d1f0d4, 0xd65d, 0x4840, {0x87, 0xbd, 0x59, 0xd7, 0xb4, 0x70, 0x2c, 0x47}}
+// {E9D1F0D4-D65D-4840-87BD-59D7B4702C47}
+
+static const MUUID interfaces[] = {MIID_CLIENTCHANGENOTIFY, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID *MirandaPluginInterfaces(void)
+{
+	return interfaces;
+}
+
+extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
+{
+	pluginInfo.version = my_make_version(PRODUCTVER);
+	return &pluginInfo;
+}
+
+extern "C" __declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion)
+{
+	oldPluginInfo.version = my_make_version(PRODUCTVER);
+	return &oldPluginInfo;
+}
+
+
+static int CALLBACK MenuWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg)
+	{
+		case WM_MEASUREITEM:
+		{
+			return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+		}
+		case WM_DRAWITEM:
+		{
+			return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+		}
+	}
+	return DefWindowProc(hWnd, uMsg, wParam, lParam);
+}
+
+
+static VOID CALLBACK ShowContactMenu(DWORD wParam)
+// wParam = hContact
+{
+	POINT pt;
+	HWND hMenuWnd = CreateWindowEx(WS_EX_TOOLWINDOW, _T("static"), _T(MOD_NAME)_T("_MenuWindow"), 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, g_hInstance, NULL);
+	SetWindowLong(hMenuWnd, GWL_WNDPROC, (LONG)(WNDPROC)MenuWndProc);
+	HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, (WPARAM)wParam, 0);
+	GetCursorPos(&pt);
+	SetForegroundWindow(hMenuWnd);
+	CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(TrackPopupMenu(hMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, hMenuWnd, NULL), MPCF_CONTACTMENU), (LPARAM)wParam);
+	PostMessage(hMenuWnd, WM_NULL, 0, 0);
+	DestroyMenu(hMenu);
+	DestroyWindow(hMenuWnd);
+}
+
+
+void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA *pdata)
+{
+	HANDLE hContact = (HANDLE)CallService(MS_POPUP_GETCONTACT, (WPARAM)hWnd, 0);
+	switch (Action)
+	{
+		case PCA_OPENMESSAGEWND: // open message window
+		{
+			if (hContact && hContact != INVALID_HANDLE_VALUE)
+			{
+				CallServiceSync(ServiceExists("SRMsg/LaunchMessageWindow") ? "SRMsg/LaunchMessageWindow" : MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0);
+			}
+		} break;
+		case PCA_OPENMENU: // open contact menu
+		{
+			if (hContact && hContact != INVALID_HANDLE_VALUE)
+			{
+				QueueUserAPC(ShowContactMenu, g_hMainThread, (ULONG_PTR)hContact);
+			}
+		} break;
+		case PCA_OPENDETAILS: // open contact details window
+		{
+			if (hContact != INVALID_HANDLE_VALUE)
+			{
+				CallServiceSync(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0);
+			}
+		} break;
+		case PCA_OPENHISTORY: // open contact history
+		{
+			if (hContact != INVALID_HANDLE_VALUE)
+			{
+				CallServiceSync(MS_HISTORY_SHOWCONTACTHISTORY, (WPARAM)hContact, 0);
+			}
+		} break;
+		case PCA_OPENLOG: // open log file
+		{
+			TCString LogFilePath;
+			LS_LOGINFO li = {0};
+			li.cbSize = sizeof(li);
+			li.szID = LOG_ID;
+			li.hContact = hContact;
+			li.Flags = LSLI_TCHAR;
+			li.tszLogPath = LogFilePath.GetBuffer(MAX_PATH);
+			if (!CallService(MS_LOGSERVICE_GETLOGINFO, (WPARAM)&li, 0))
+			{
+				LogFilePath.ReleaseBuffer();
+				ShowLog(LogFilePath);
+			} else
+			{
+				LogFilePath.ReleaseBuffer();
+			}
+		} break;
+		case PCA_CLOSEPOPUP: // close popup
+		{
+			PUDeletePopUp(hWnd);
+		} break;
+		case PCA_DONOTHING: // do nothing
+			break;
+	}
+}
+
+
+static int CALLBACK PopupWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	PLUGIN_DATA *pdata = (PLUGIN_DATA*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, 0);
+	if (pdata)
+	{
+		switch (message)
+		{
+			case WM_COMMAND:
+			{
+				if (HIWORD(wParam) == STN_CLICKED) // left mouse button
+				{
+					Popup_DoAction(hWnd, pdata->PopupLClickAction, pdata);
+					return true;
+				}
+			} break;
+			case WM_CONTEXTMENU:	// right mouse button
+			{
+				Popup_DoAction(hWnd, pdata->PopupRClickAction, pdata);
+				return true;
+			} break;
+			case UM_FREEPLUGINDATA:
+			{
+				if (pdata->hIcon)
+				{
+					DestroyIcon(pdata->hIcon);
+				}
+				free(pdata);
+				return false;
+			} break;
+		}
+	}
+	return DefWindowProc(hWnd, message, wParam, lParam);
+}
+
+
+void ShowPopup(SHOWPOPUP_DATA *sd)
+{
+	TCString PopupText;
+	if (sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_SHOWPREVCLIENT))
+	{
+		mir_sntprintf(PopupText.GetBuffer(MAX_MSG_LEN), MAX_MSG_LEN, TranslateT("changed client to %s (was %s)"), (const TCHAR*)sd->MirVer, (const TCHAR*)sd->OldMirVer);
+		PopupText.ReleaseBuffer();
+	} else
+	{
+		mir_sntprintf(PopupText.GetBuffer(MAX_MSG_LEN), MAX_MSG_LEN, TranslateT("changed client to %s"), (const TCHAR*)sd->MirVer);
+		PopupText.ReleaseBuffer();
+	}
+	PLUGIN_DATA *pdata = (PLUGIN_DATA*)calloc(1, sizeof(PLUGIN_DATA));
+	POPUPDATAT ppd = {0};
+	ppd.lchContact = sd->hContact;
+	char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)sd->hContact, 0);
+	pdata->hIcon = ppd.lchIcon = (HICON)CallService(MS_FP_GETCLIENTICON, (WPARAM)(const char*)TCHAR2ANSI(sd->MirVer), false);
+	_ASSERT(ppd.lchIcon);
+	if (!ppd.lchIcon || (DWORD)ppd.lchIcon == CALLSERVICE_NOTFOUND)
+	{ // if we didn't succeed retrieving client icon, show the usual status icon instead
+		ppd.lchIcon = LoadSkinnedProtoIcon(szProto, DBGetContactSettingWord(sd->hContact, szProto, "Status", ID_STATUS_OFFLINE));
+		pdata->hIcon = NULL;
+	}
+	_tcsncpy(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)sd->hContact, GCDNF_TCHAR), lengthof(ppd.lptzContactName) - 1);
+	_tcsncpy(ppd.lptzText, PopupText, lengthof(ppd.lptzText) - 1);
+	ppd.colorBack = (sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_DEFBGCOLOUR) ? 0 : sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_BGCOLOUR));
+	ppd.colorText = (sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_DEFTEXTCOLOUR) ? 0 : sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_TEXTCOLOUR));
+	ppd.PluginWindowProc = (WNDPROC)PopupWndProc;
+	pdata->PopupLClickAction = sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_LCLICK_ACTION);
+	pdata->PopupRClickAction = sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_RCLICK_ACTION);
+	ppd.iSeconds = sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_POPUPDELAY);
+	ppd.PluginData = pdata;
+	CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&ppd, 0);
+}
+
+
+int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
+{
+	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
+	if (!lstrcmpA(cws->szSetting, DB_MIRVER))
+	{
+		HANDLE hContact = (HANDLE)wParam;
+		SHOWPOPUP_DATA sd = {0};
+		char *szProto = NULL;
+		if (g_PreviewOptPage)
+		{
+			sd.MirVer = _T("Miranda IM 0.6.0.1 (ICQ v0.3.7 alpha)");
+		} else
+		{
+			if (!hContact) // exit if hContact == NULL and it's not a popup preview
+			{
+				return 0;
+			}
+			szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+			_ASSERT(szProto);
+			if (ServiceExists(MS_MC_GETPROTOCOLNAME) && !strcmp(szProto, (char*)CallService(MS_MC_GETPROTOCOLNAME, 0, 0))) // workaround for metacontacts
+			{
+				return 0;
+			}
+			sd.MirVer = DBGetContactSettingString(hContact, szProto, DB_MIRVER, _T(""));
+			if (sd.MirVer.IsEmpty())
+			{
+				return 0;
+			}
+		}
+		sd.OldMirVer = DBGetContactSettingString(hContact, MOD_NAME, DB_OLDMIRVER, _T(""));
+		DBWriteContactSettingTString(hContact, MOD_NAME, DB_OLDMIRVER, sd.MirVer); // we have to write it here, because we modify sd.OldMirVer and sd.MirVer to conform our settings later
+		if (sd.OldMirVer.IsEmpty())
+		{ // looks like it's the right way to do
+			return 0;
+		}
+		COptPage PopupOptPage;
+		if (g_PreviewOptPage)
+		{
+			PopupOptPage = *g_PreviewOptPage;
+		} else
+		{
+			PopupOptPage = g_PopupOptPage;
+			PopupOptPage.DBToMem();
+		}
+		HANDLE hContactOrMeta = (hContact && ServiceExists(MS_MC_GETMETACONTACT)) ? (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0) : hContact;
+		if (!hContactOrMeta)
+		{
+			hContactOrMeta = hContact;
+		}
+		if (hContact && DBGetContactSettingByte(hContactOrMeta, "CList", "Hidden", 0))
+		{
+			return 0;
+		}
+		int PerContactSetting = hContact ? DBGetContactSettingByte(hContact, MOD_NAME, DB_CCN_NOTIFY, NOTIFY_USEGLOBAL) : NOTIFY_ALWAYS; // NOTIFY_ALWAYS for preview
+		if (PerContactSetting == NOTIFY_USEGLOBAL && hContactOrMeta != hContact) // subcontact setting has a priority over a metacontact setting
+		{
+			PerContactSetting = DBGetContactSettingByte(hContactOrMeta, MOD_NAME, DB_CCN_NOTIFY, NOTIFY_USEGLOBAL);
+		}
+		if (PerContactSetting && (PerContactSetting == NOTIFY_ALMOST_ALWAYS || PerContactSetting == NOTIFY_ALWAYS || !PopupOptPage.GetValue(IDC_POPUPOPTDLG_USESTATUSNOTIFYFLAG) || !(DBGetContactSettingDword(hContactOrMeta, "Ignore", "Mask1", 0) & 0x8))) // check if we need to notify at all
+		{
+			sd.hContact = hContact;
+			sd.PopupOptPage = &PopupOptPage;
+			if (!PopupOptPage.GetValue(IDC_POPUPOPTDLG_VERCHGNOTIFY) || !PopupOptPage.GetValue(IDC_POPUPOPTDLG_SHOWVER))
+			{
+				CString OldMirVerA = TCHAR2ANSI(sd.OldMirVer);
+				CString MirVerA = TCHAR2ANSI(sd.MirVer);
+				if (ServiceExists(MS_FP_SAMECLIENTS))
+				{
+					char *szOldClient = (char*)CallService(MS_FP_SAMECLIENTS, (WPARAM)(const char*)OldMirVerA, (LPARAM)(const char*)OldMirVerA); // remove version from MirVer strings. I know, the way in which MS_FP_SAMECLIENTS is used here is pretty ugly, but at least it gives necessary results
+					char *szClient = (char*)CallService(MS_FP_SAMECLIENTS, (WPARAM)(const char*)MirVerA, (LPARAM)(const char*)MirVerA);
+					if (szOldClient && szClient)
+					{
+						if (PerContactSetting != NOTIFY_ALMOST_ALWAYS && PerContactSetting != NOTIFY_ALWAYS && !PopupOptPage.GetValue(IDC_POPUPOPTDLG_VERCHGNOTIFY) && !strcmp(szClient, szOldClient))
+						{
+							return 0;
+						}
+						if (!PopupOptPage.GetValue(IDC_POPUPOPTDLG_SHOWVER))
+						{
+							sd.MirVer = ANSI2TCHAR(szClient);
+							sd.OldMirVer = ANSI2TCHAR(szOldClient);
+						}
+					}
+				}
+			}
+			if (sd.MirVer == (const TCHAR*)sd.OldMirVer)
+			{
+				_ASSERT(hContact);
+				return 0;
+			}
+			if (PerContactSetting == NOTIFY_ALWAYS || (PopupOptPage.GetValue(IDC_POPUPOPTDLG_POPUPNOTIFY) && (g_PreviewOptPage || PerContactSetting == NOTIFY_ALMOST_ALWAYS || !PcreCheck(sd.MirVer))))
+			{
+				ShowPopup(&sd);
+				SkinPlaySound(CLIENTCHANGED_SOUND);
+			}
+		}
+		if (hContact)
+		{
+			TCString ClientName;
+			if (PopupOptPage.GetValue(IDC_POPUPOPTDLG_SHOWPREVCLIENT) && sd.OldMirVer.GetLen())
+			{
+				mir_sntprintf(ClientName.GetBuffer(MAX_MSG_LEN), MAX_MSG_LEN, TranslateT("%s (was %s)"), (const TCHAR*)sd.MirVer, (const TCHAR*)sd.OldMirVer);
+				ClientName.ReleaseBuffer();
+			} else
+			{
+				ClientName = sd.MirVer;
+			}
+			if (ServiceExists(MS_VARS_FORMATSTRING))
+			{
+				logservice_log(LOG_ID, hContact, ClientName);
+			} else
+			{
+				_ASSERT(szProto);
+				TCString szUID(_T(""));
+				char *uid = (char*)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
+				if (uid && (int)uid != CALLSERVICE_NOTFOUND)
+				{
+					szUID = DBGetContactSettingAsString(hContact, szProto, uid, _T(""));
+				}
+				logservice_log(LOG_ID, hContact, TCString((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)) + _T(" (") + szUID + TranslateT(") changed client to ") + ClientName);
+			}
+		}
+		_ASSERT(sd.MirVer.GetLen()); // save the last known MirVer value even if the new one is empty
+	}
+	return 0;
+}
+
+
+static int ContactSettingsInit(WPARAM wParam, LPARAM lParam)
+{
+	CONTACTSETTINGSINIT *csi = (CONTACTSETTINGSINIT*)wParam;
+	char *szProto = (csi->Type == CSIT_CONTACT) ? (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)csi->hContact, 0) : NULL;
+	if ((csi->Type == CSIT_GROUP) || (szProto && csi->Type == CSIT_CONTACT))
+	{
+		int Flag1 = (csi->Type == CSIT_CONTACT) ? CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) : PF1_IM; // if it's a group settings dialog, we assume that there are possibly some contacts in the group with PF1_IM capability
+		if (Flag1 & (PF1_IMRECV | PF1_URLRECV | PF1_FILERECV)) // I hope, these flags are sufficient to describe which protocols can theoretically have a client
+		{
+			CONTACTSETTINGSCONTROL csc = {0};
+			csc.cbSize = sizeof(csc);
+			csc.cbStateSize = sizeof(CSCONTROLSTATE);
+			csc.Position = CSPOS_SORTBYALPHABET;
+			csc.Flags = CSCF_TCHAR;
+			csc.ControlType = CSCT_COMBOBOX;
+			csc.ptszTitle = LPGENT("Client change notifications:");
+			csc.ptszGroup = CSGROUP_NOTIFICATIONS;
+			csc.szModule = MOD_NAME;
+			csc.szSetting = DB_CCN_NOTIFY;
+			csc.StateNum = 4;
+			csc.DefState = 3;
+			CSCONTROLSTATE States[] = {CSCONTROLSTATE(LPGENT("Never, ignore client changes for this contact"), (BYTE)NOTIFY_IGNORE), CSCONTROLSTATE(LPGENT("Always except when client change notifications are disabled globally"), (BYTE)NOTIFY_ALMOST_ALWAYS), CSCONTROLSTATE(LPGENT("Always, even when client change notifications are disabled globally"), (BYTE)NOTIFY_ALWAYS), CSCONTROLSTATE(LPGENT("Use global settings (default)"), (BYTE)NOTIFY_USEGLOBAL)};
+			csc.pStates = States;
+			CallService(MS_CONTACTSETTINGS_ADDCONTROL, wParam, (LPARAM)&csc);
+		}
+	}
+	return 0;
+}
+
+
+static int srvTogglePopups(WPARAM wParam, LPARAM lParam)
+{
+	g_PopupOptPage.SetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY, !g_PopupOptPage.GetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY));
+	return 0;
+}
+
+
+static int PrebuildMainMenu(WPARAM wParam, LPARAM lParam)
+{ // we have to use ME_CLIST_PREBUILDMAINMENU instead of updating menu items only on settings change, because "popup_enabled" and "popup_disabled" icons are not always available yet in ModulesLoaded
+	if (ServiceExists(MS_POPUP_ADDPOPUPT))
+	{
+		CLISTMENUITEM mi = {0};
+		mi.cbSize = sizeof(mi);
+		mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | CMIM_NAME | CMIM_ICON;
+		if (g_PopupOptPage.GetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY))
+		{
+			mi.ptszName = TranslateT("Disable c&lient change notification");
+			mi.hIcon = ServiceExists(MS_SKIN2_GETICON) ? (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"popup_enabled") : NULL;
+		} else
+		{
+			mi.ptszName = TranslateT("Enable c&lient change notification");
+			mi.hIcon = ServiceExists(MS_SKIN2_GETICON) ? (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"popup_disabled") : NULL;
+		}
+		mi.ptszPopupName = TranslateT("PopUps");
+		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)g_hTogglePopupsMenuItem, (LPARAM)&mi);
+	}
+	return 0;
+}
+
+
+int CALLBACK CCNErrorDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg)
+	{
+		case WM_INITDIALOG:
+		{
+			TranslateDialogDefault(hwndDlg);
+			return true;
+		} break;
+		case WM_COMMAND:
+		{
+			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
+			{
+				DestroyWindow(hwndDlg);
+			}
+		} break;
+		case WM_DESTROY:
+		{
+			if (IsDlgButtonChecked(hwndDlg, IDC_DONTREMIND))
+			{
+				DBWriteContactSettingByte(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 1);
+			}
+		} break;
+	}
+	return 0;
+}
+
+
+int MirandaLoaded(WPARAM wParam, LPARAM lParam)
+{
+	InitPcre();
+	COptPage PopupOptPage(g_PopupOptPage);
+	PopupOptPage.DBToMem();
+	RecompileRegexps(*(TCString*)PopupOptPage.GetValue(IDC_POPUPOPTDLG_IGNORESTRINGS));
+	hHooks.AddElem(HookEvent(ME_OPT_INITIALISE, OptionsDlgInit));
+	hHooks.AddElem(HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ContactSettingChanged));
+	hHooks.AddElem(HookEvent(ME_CONTACTSETTINGS_INITIALISE, ContactSettingsInit));
+	SkinAddNewSound(CLIENTCHANGED_SOUND, Translate("ClientChangeNotify: Client changed"), "");
+// updater plugin support
+	Update update = {0};
+	char szVersion[16];
+	update.cbSize = sizeof(Update);
+	update.szComponentName = pluginInfo.shortName;
+	update.pbVersion = (BYTE*)CreateVersionString(my_make_version(PRODUCTVER), szVersion);
+	update.cpbVersion = strlen((char*)update.pbVersion);
+	update.szUpdateURL = "http://deathdemon.int.ru/projects/ClientChangeNotify"
+#ifdef _UNICODE
+		"W"
+#endif
+		".zip";
+	update.szVersionURL = "http://deathdemon.int.ru/updaterinfo.php";
+	update.pbVersionPrefix = (BYTE*)"ClientChangeNotify"
+#ifdef _UNICODE
+		" Unicode"
+#endif
+		" version ";
+	update.cpbVersionPrefix = strlen((char*)update.pbVersionPrefix);
+	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
+
+	if (ServiceExists(MS_POPUP_ADDPOPUPT))
+	{
+		hServices.AddElem(CreateServiceFunction(MS_CCN_TOGGLEPOPUPS, srvTogglePopups));
+		hHooks.AddElem(HookEvent(ME_CLIST_PREBUILDMAINMENU, PrebuildMainMenu));
+		CLISTMENUITEM mi = {0};
+		mi.cbSize = sizeof(mi);
+		mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+		if (g_PopupOptPage.GetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY))
+		{
+			mi.ptszName = TranslateT("Disable c&lient change notification");
+		} else
+		{
+			mi.ptszName = TranslateT("Enable c&lient change notification");
+		}
+		mi.pszService = MS_CCN_TOGGLEPOPUPS;
+		mi.ptszPopupName = TranslateT("PopUps");
+		g_hTogglePopupsMenuItem = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi);
+	}
+
+/*	if (DBGetContactSettingByte(NULL, MOD_NAME, DB_FIRSTRUN, 1)) // DB_SETTINGSVER
+	{
+		DBWriteContactSettingByte(NULL, MOD_NAME, DB_FIRSTRUN, 0);
+		HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); // copy MirVer to OldMirVer for every contact; well, it won't work for every possible case (we can't detect when user had disabled the plugin for some time and then enabled it again), but at least it'll work once, for the first run ;)
+		do
+		{
+			char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+			if (szProto)
+			{
+				TCString MirVer(DBGetContactSettingString(hContact, szProto, DB_MIRVER, _T("")));
+				if (MirVer.GetLen())
+				{
+					DBWriteContactSettingTString(hContact, MOD_NAME, DB_OLDMIRVER, MirVer);
+				}
+			}
+		} while (hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0));
+	}*/
+	if ((!ServiceExists(MS_FP_SAMECLIENTS) || !ServiceExists(MS_FP_GETCLIENTICON)) && !DBGetContactSettingByte(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 0))
+	{ // seems that Fingerprint is not installed
+		CreateDialog(g_hInstance, MAKEINTRESOURCE(IDD_CCN_ERROR), NULL, CCNErrorDlgProc);
+	}
+	logservice_register(LOG_ID, LPGENT("ClientChangeNotify"), _T("ClientChangeNotify?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log"), TranslateT("`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%"));
+	return 0;
+}
+
+
+extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
+{
+	pluginLink = link;
+	mir_getMMI( &mmi );
+	mir_getLP( &pluginInfo );
+
+	hHooks.AddElem(HookEvent(ME_SYSTEM_MODULESLOADED, MirandaLoaded));
+	DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &g_hMainThread, THREAD_SET_CONTEXT, false, 0);
+	InitOptions();
+	if (DBGetContactSettingString(NULL, "KnownModules", MOD_NAME, (char*)NULL) == NULL)
+	{
+		DBWriteContactSettingString(NULL, "KnownModules", MOD_NAME, MOD_NAME);
+	}
+	if (DBGetContactSettingByte(NULL, MOD_NAME, DB_SETTINGSVER, 0) < 1)
+	{
+		TCString Str;
+		Str = DBGetContactSettingString(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, _T(""));
+		if (Str.GetLen())
+		{ // fix incorrect regexp from v0.1.1.0
+			DBWriteContactSettingTString(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, Str.Replace(_T("/Miranda[0-9A-F]{8}/"), _T("/[0-9A-F]{8}(\\W|$)/")));
+		}
+		DBWriteContactSettingByte(NULL, MOD_NAME, DB_SETTINGSVER, 1);
+	}
+	return 0;
+}
+
+extern "C" int __declspec(dllexport) Unload()
+{
+	CloseHandle(g_hMainThread);
+	int I;
+	for (I = 0; I < hHooks.GetSize(); I++)
+	{
+		if (hHooks[I])
+		{
+			UnhookEvent(hHooks[I]);
+		}
+	}
+	for (I = 0; I < hServices.GetSize(); I++)
+	{
+		if (hServices[I])
+		{
+			DestroyServiceFunction(hServices[I]);
+		}
+	}
+	UninitPcre();
+	return 0;
+}
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.sln b/plugins/ClientChangeNotify/ClientChangeNotify.sln
new file mode 100644
index 0000000000..bb5cd4cfb2
--- /dev/null
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.sln
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientChangeNotify", "ClientChangeNotify.vcproj", "{6A1969EA-9657-4828-93E0-8D21A970F868}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.Debug.ActiveCfg = Debug|Win32
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.Debug.Build.0 = Debug|Win32
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.DebugW.ActiveCfg = DebugW|Win32
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.DebugW.Build.0 = DebugW|Win32
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.Release.ActiveCfg = Release|Win32
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.Release.Build.0 = Release|Win32
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.ReleaseW.ActiveCfg = ReleaseW|Win32
+		{6A1969EA-9657-4828-93E0-8D21A970F868}.ReleaseW.Build.0 = ReleaseW|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
new file mode 100644
index 0000000000..f799f51d38
--- /dev/null
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6A1969EA-9657-4828-93E0-8D21A970F868}</ProjectGuid>
+    <SccProjectName />
+    <SccLocalPath />
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>true</MapExports>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\ClientChangeNotify.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+    </ClCompile>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <BaseAddress>
+      </BaseAddress>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/ClientChangeNotify.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ClientChangeNotify.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\CommonLibs\CString.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="OptDlg.cpp" />
+    <ClCompile Include="..\CommonLibs\Options.cpp" />
+    <ClCompile Include="..\CommonLibs\pcre.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AggressiveOptimize.h" />
+    <ClInclude Include="Common.h" />
+    <ClInclude Include="..\CommonLibs\CString.h" />
+    <ClInclude Include="Misc.h" />
+    <ClInclude Include="..\CommonLibs\Options.h" />
+    <ClInclude Include="..\CommonLibs\pcre.h" />
+    <ClInclude Include="..\CommonLibs\pcre_main.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\CommonLibs\TMyArray.h" />
+    <ClInclude Include="VersionNo.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resources.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources.rc2" />
+    <None Include="ccn_readme.txt" />
+    <None Include="ccn_translation.txt" />
+    <None Include="copying.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
new file mode 100644
index 0000000000..a759383b0b
--- /dev/null
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{e992e4eb-93a1-48d9-bd6f-fc3f8d8827d8}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{3f017356-9531-4fba-a88d-590632fd2687}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{3887cace-f8eb-45a3-854b-f32b02819763}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Documentation">
+      <UniqueIdentifier>{b95423d3-105d-4742-a96e-d7c2d0ecc514}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ClientChangeNotify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CommonLibs\CString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CommonLibs\Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CommonLibs\pcre.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AggressiveOptimize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CommonLibs\CString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Misc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CommonLibs\Options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CommonLibs\pcre.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CommonLibs\pcre_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CommonLibs\TMyArray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VersionNo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resources.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources.rc2">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="ccn_readme.txt">
+      <Filter>Documentation</Filter>
+    </None>
+    <None Include="ccn_translation.txt">
+      <Filter>Documentation</Filter>
+    </None>
+    <None Include="copying.txt">
+      <Filter>Documentation</Filter>
+    </None>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/ClientChangeNotify/Common.h b/plugins/ClientChangeNotify/Common.h
new file mode 100644
index 0000000000..d45b6d007d
--- /dev/null
+++ b/plugins/ClientChangeNotify/Common.h
@@ -0,0 +1,152 @@
+/*
+	ClientChangeNotify - Plugin for Miranda IM
+	Copyright (c) 2006-2008 Chervov Dmitry
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#pragma once
+
+#define _CRT_SECURE_NO_WARNINGS
+#define WIN32_LEAN_AND_MEAN
+
+#define CHARARRAY_CONVERT
+
+#include <windows.h>
+#include <commctrl.h>
+#include <stdlib.h>
+#include <crtdbg.h>
+#include <shellapi.h>
+#include <commdlg.h>
+
+#include "resource.h"
+#include "newpluginapi.h"
+#include "statusmodes.h"
+#include "m_popup.h"
+#include "m_skin.h"
+#include "m_langpack.h"
+#include "m_options.h"
+#include "m_clist.h"
+#include "m_LogService.h"
+#include "m_system.h"
+#include "m_fingerprint.h"
+#include "..\CommonLibs\TMyArray.h"
+#include "..\CommonLibs\Options.h"
+#include "..\CommonLibs\CString.h"
+#include "..\CommonLibs\pcre.h"
+
+#pragma comment(lib,"comctl32.lib")
+
+#ifndef lengthof
+#define lengthof(s) (sizeof(s) / sizeof((s)[0]))
+#endif
+
+// Actions on popup click
+#define PCA_OPENMESSAGEWND	0	// open message window
+#define PCA_CLOSEPOPUP			1	// close popup
+#define PCA_OPENDETAILS			2	// open contact details window
+#define PCA_OPENMENU				3	// open contact menu
+#define PCA_OPENHISTORY			4	// open contact history
+#define PCA_OPENLOG         5 // open log file
+#define PCA_DONOTHING				6 // do nothing
+
+#define POPUP_DEF_LCLICKACTION PCA_OPENMESSAGEWND
+#define POPUP_DEF_RCLICKACTION PCA_CLOSEPOPUP
+#define POPUP_DEF_POPUP_BGCOLOUR 0xEAFFFB
+#define POPUP_DEF_POPUP_TEXTCOLOUR 0
+#define POPUP_DEF_USEDEFBGCOLOUR 0
+#define POPUP_DEF_USEDEFTEXTCOLOUR 0
+#define POPUP_DEF_POPUPDELAY 0
+
+#define IGNORESTRINGS_MAX_LEN 2048
+#define MAX_MSG_LEN 8192
+
+#define NOTIFYTIMER_INTERVAL 3500
+
+#define MOD_NAME "ClientChangeNotify"
+#define LOG_ID MOD_NAME
+#define LOG_PREFIX MOD_NAME ": " // for netlib.log
+
+#define MS_NETLIB_LOG "Netlib/Log"
+
+#define DB_MIRVER "MirVer"
+#define DB_OLDMIRVER "OldMirVer"
+#define DB_NO_FINGERPRINT_ERROR "NoFingerprintError"
+#define DB_IGNORESUBSTRINGS "IgnoreSubstrings"
+#define DB_SETTINGSVER "SettingsVer"
+
+#define DB_CCN_NOTIFY "Notify" // database key name used for per-contact settings; 0 = ignore, 1 = notify always, 2 = use global settings
+#define NOTIFY_IGNORE 0
+#define NOTIFY_ALMOST_ALWAYS 1 // don't notify only when CCN popups are disabled globally in the plugin
+#define NOTIFY_ALWAYS 2
+#define NOTIFY_USEGLOBAL 3
+
+#define CLIENTCHANGED_SOUND "ClientChanged"
+
+extern HINSTANCE g_hInstance;
+
+extern COptPage g_PopupOptPage;
+extern COptPage *g_PreviewOptPage;
+
+#define MS_VARS_FORMATSTRING "Vars/FormatString"
+#define MS_CCN_TOGGLEPOPUPS "ClientChangeNotify/TogglePopups"
+
+
+static __inline CString LogMessage(const char *Format, ...)
+{
+	va_list va;
+	char szText[8096];
+	strcpy(szText, LOG_PREFIX);
+	va_start(va, Format);
+	mir_vsnprintf(szText + (lengthof(LOG_PREFIX) - 1), sizeof(szText) - (lengthof(LOG_PREFIX) - 1), Format, va);
+	va_end(va);
+	CallService(MS_NETLIB_LOG, NULL, (LPARAM)szText);
+	return CString(szText);
+}
+
+
+// ClientChangeNotify.cpp
+
+struct PLUGIN_DATA
+{
+	HICON hIcon; // needed here to destroy its handle on UM_FREEPLUGINDATA
+	int PopupLClickAction;
+	int PopupRClickAction;
+};
+
+struct SHOWPOPUP_DATA
+{
+	HANDLE hContact;
+	TCString OldMirVer;
+	TCString MirVer;
+	COptPage *PopupOptPage;
+};
+
+
+// additional m_popup.h declarations
+#ifdef _UNICODE
+	#define POPUPDATAT POPUPDATAW
+	#define MS_POPUP_ADDPOPUPT MS_POPUP_ADDPOPUPW
+#else
+	#define POPUPDATAT POPUPDATAEX
+	#define MS_POPUP_ADDPOPUPT MS_POPUP_ADDPOPUPEX
+#endif
+
+
+int ContactSettingChanged(WPARAM wParam, LPARAM lParam);
+
+// OptDlg.cpp
+int OptionsDlgInit(WPARAM wParam, LPARAM lParam);
+void InitOptions();
diff --git a/plugins/ClientChangeNotify/Misc.h b/plugins/ClientChangeNotify/Misc.h
new file mode 100644
index 0000000000..262193dc26
--- /dev/null
+++ b/plugins/ClientChangeNotify/Misc.h
@@ -0,0 +1,83 @@
+/*
+	ClientChangeNotify - Plugin for Miranda IM
+	Copyright (c) 2006-2008 Chervov Dmitry
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "Common.h"
+
+
+__inline void ShowMsg(TCHAR *FirstLine, TCHAR *SecondLine = _T(""), bool IsErrorMsg = false, int Timeout = 0)
+{
+	if (ServiceExists(MS_POPUP_ADDPOPUPEX))
+	{
+		POPUPDATAT ppd = {0};
+		ppd.lchIcon = LoadIcon(NULL, IsErrorMsg ? IDI_EXCLAMATION : IDI_INFORMATION);
+		lstrcpy(ppd.lptzContactName, FirstLine);
+		lstrcpy(ppd.lptzText, SecondLine);
+		ppd.colorBack = IsErrorMsg ? 0x0202E3 : 0xE8F1FD;
+		ppd.colorText = IsErrorMsg ? 0xE8F1FD : 0x000000;
+		ppd.iSeconds = Timeout;
+		CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&ppd, 0);
+	} else
+	{
+		MessageBox(NULL, SecondLine, FirstLine, MB_OK | (IsErrorMsg ? MB_ICONEXCLAMATION : MB_ICONINFORMATION));
+	}
+}
+
+
+__inline TCString Path_ToRelative(TCString &Path)
+{
+	CString Str;
+	Str.GetBuffer(MAX_PATH);
+	CallService(MS_UTILS_PATHTORELATIVE, (WPARAM)(const char*)TCHAR2ANSI(Path), (LPARAM)(char*)Str);
+	Str.ReleaseBuffer();
+	return ANSI2TCHAR(Str);
+}
+
+
+__inline TCString Path_ToAbsolute(TCString &Path)
+{
+	CString Str;
+	Str.GetBuffer(MAX_PATH);
+	CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)(const char*)TCHAR2ANSI(Path), (LPARAM)(char*)Str);
+	Str.ReleaseBuffer();
+	return ANSI2TCHAR(Str);
+}
+
+
+__inline void ShowLog(TCString &LogFilePath)
+{
+	int Result = (int)ShellExecute(NULL, _T("open"), LogFilePath, NULL, NULL, SW_SHOW);
+	if (Result <= 32) // Error
+	{
+		TCHAR szError[64];
+		mir_sntprintf(szError, lengthof(szError), TranslateT("Error #%d"), Result);
+		ShowMsg(szError, TranslateT("Can't open log file ") + LogFilePath, true);
+	}
+}
+
+
+__inline void RecompileRegexps(TCString IgnoreSubstrings)
+{
+	FreePcreCompileData();
+	TCHAR *p = _tcstok(IgnoreSubstrings, _T(";"));
+	while (p)
+	{
+		CompileRegexp(p, p[0] != '/');
+		p = _tcstok(NULL, _T(";"));
+	}
+}
diff --git a/plugins/ClientChangeNotify/OptDlg.cpp b/plugins/ClientChangeNotify/OptDlg.cpp
new file mode 100644
index 0000000000..0c02f2b5e4
--- /dev/null
+++ b/plugins/ClientChangeNotify/OptDlg.cpp
@@ -0,0 +1,230 @@
+/*
+	ClientChangeNotify - Plugin for Miranda IM
+	Copyright (c) 2006-2008 Chervov Dmitry
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "Common.h"
+#include "Misc.h"
+
+
+// ================================================ Popup options ================================================
+
+COptPage g_PopupOptPage(MOD_NAME, NULL);
+
+
+void EnablePopupOptDlgControls()
+{
+	int I;
+	g_PopupOptPage.PageToMem();
+	int UsePopups = g_PopupOptPage.GetValue(IDC_POPUPOPTDLG_POPUPNOTIFY);
+	for (I = 0; I < g_PopupOptPage.Items.GetSize(); I++)
+	{
+		switch (g_PopupOptPage.Items[I]->GetParam())
+		{
+			case IDC_POPUPOPTDLG_POPUPNOTIFY:
+			{
+				g_PopupOptPage.Items[I]->Enable(UsePopups);
+			} break;
+			case IDC_POPUPOPTDLG_DEFBGCOLOUR:
+			{
+				g_PopupOptPage.Items[I]->Enable(UsePopups && !g_PopupOptPage.GetValue(IDC_POPUPOPTDLG_DEFBGCOLOUR));
+			} break;
+			case IDC_POPUPOPTDLG_DEFTEXTCOLOUR:
+			{
+				g_PopupOptPage.Items[I]->Enable(UsePopups && !g_PopupOptPage.GetValue(IDC_POPUPOPTDLG_DEFTEXTCOLOUR));
+			} break;
+		}
+	}
+	if (g_PopupOptPage.GetValue(IDC_POPUPOPTDLG_VERCHGNOTIFY))
+	{
+		COptItem *ShowVer = g_PopupOptPage.Find(IDC_POPUPOPTDLG_SHOWVER);
+		ShowVer->SetValue(1);
+		ShowVer->Enable(false);
+		ShowVer->MemToWnd(g_PopupOptPage.hWnd);
+	}
+	if (!ServiceExists(MS_FP_SAMECLIENTS))
+	{ // disable these checkboxes if Fingerprint wasn't found
+		g_PopupOptPage.Find(IDC_POPUPOPTDLG_VERCHGNOTIFY)->Enable(false);
+		g_PopupOptPage.Find(IDC_POPUPOPTDLG_SHOWVER)->Enable(false);
+	}
+	if (PcreEnabled())
+	{
+		SetDlgItemText(g_PopupOptPage.GetWnd(), IDC_POPUPOPTDLG_STATIC_REGEXP, TranslateT("(you can use regular expressions here)"));
+	}
+	g_PopupOptPage.MemToPage(true);
+	InvalidateRect(GetDlgItem(g_PopupOptPage.GetWnd(), IDC_POPUPOPTDLG_POPUPDELAY_SPIN), NULL, false); // update spin control
+}
+
+
+int CALLBACK PopupOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	static int ChangeLock = 0;
+	switch (msg)
+	{
+		case WM_INITDIALOG:
+		{
+			TranslateDialogDefault(hwndDlg);
+			ChangeLock++;
+			g_PopupOptPage.SetWnd(hwndDlg);
+			SendDlgItemMessage(hwndDlg, IDC_POPUPOPTDLG_POPUPDELAY, EM_LIMITTEXT, 4, 0);
+			SendDlgItemMessage(hwndDlg, IDC_POPUPOPTDLG_IGNORESTRINGS, EM_LIMITTEXT, IGNORESTRINGS_MAX_LEN, 0);
+			SendDlgItemMessage(hwndDlg, IDC_POPUPOPTDLG_POPUPDELAY_SPIN, UDM_SETRANGE32, -1, 9999);
+
+			HWND hLCombo = GetDlgItem(hwndDlg, IDC_POPUPOPTDLG_LCLICK_ACTION);
+			HWND hRCombo = GetDlgItem(hwndDlg, IDC_POPUPOPTDLG_RCLICK_ACTION);
+			static struct {
+				TCHAR *Text;
+				int Action;
+			} PopupActions[] = {
+				LPGENT("Open message window"), PCA_OPENMESSAGEWND,
+				LPGENT("Close popup"), PCA_CLOSEPOPUP,
+				LPGENT("Open contact details window"), PCA_OPENDETAILS,
+				LPGENT("Open contact menu"), PCA_OPENMENU,
+				LPGENT("Open contact history"), PCA_OPENHISTORY,
+				LPGENT("Open log file"), PCA_OPENLOG,
+				LPGENT("Do nothing"), PCA_DONOTHING
+			};
+			int I;
+			for (I = 0; I < lengthof(PopupActions); I++)
+			{
+				SendMessage(hLCombo, CB_SETITEMDATA, SendMessage(hLCombo, CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[I].Text)), PopupActions[I].Action);
+				SendMessage(hRCombo, CB_SETITEMDATA, SendMessage(hRCombo, CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[I].Text)), PopupActions[I].Action);
+			}
+			g_PopupOptPage.DBToMemToPage();
+			EnablePopupOptDlgControls();
+			ChangeLock--;
+			return true;
+		} break;
+		case WM_NOTIFY:
+		{
+			switch (((NMHDR*)lParam)->code)
+			{
+				case PSN_APPLY:
+				{
+					g_PopupOptPage.PageToMemToDB();
+					RecompileRegexps(*(TCString*)g_PopupOptPage.GetValue(IDC_POPUPOPTDLG_IGNORESTRINGS));
+					return true;
+				} break;
+			}
+		} break;
+		case WM_COMMAND:
+		{
+			switch (HIWORD(wParam))
+			{
+				case BN_CLICKED:
+				{
+					switch (LOWORD(wParam))
+					{
+						case IDC_POPUPOPTDLG_POPUPNOTIFY:
+						case IDC_POPUPOPTDLG_DEFBGCOLOUR:
+						case IDC_POPUPOPTDLG_DEFTEXTCOLOUR:
+						case IDC_POPUPOPTDLG_VERCHGNOTIFY:
+						{
+							EnablePopupOptDlgControls();
+						} // go through
+						case IDC_POPUPOPTDLG_SHOWPREVCLIENT:
+						case IDC_POPUPOPTDLG_SHOWVER:
+						case IDC_POPUPOPTDLG_USESTATUSNOTIFYFLAG:
+						{
+							SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
+							return 0;
+						} break;
+						case IDC_POPUPOPTDLG_POPUPPREVIEW:
+						{
+							g_PreviewOptPage = new COptPage(g_PopupOptPage);
+							g_PreviewOptPage->PageToMem();
+							DBCONTACTWRITESETTING cws = {0};
+							cws.szModule = "ICQ";
+              cws.szSetting = DB_MIRVER;
+							DBWriteContactSettingString(NULL, MOD_NAME, DB_OLDMIRVER, "ICQ Lite v5");
+							ContactSettingChanged(NULL, (LPARAM)&cws); // simulate a version change
+							delete g_PreviewOptPage;
+							g_PreviewOptPage = NULL;
+						} break;
+					}
+				} break;
+				case EN_CHANGE:
+				{
+					if (LOWORD(wParam) == IDC_POPUPOPTDLG_POPUPDELAY || LOWORD(wParam) == IDC_POPUPOPTDLG_IGNORESTRINGS)
+					{
+						if (!ChangeLock && g_PopupOptPage.GetWnd())
+						{
+							SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
+						}
+					}
+				} break;
+				case CBN_SELCHANGE:
+				{
+					if ((LOWORD(wParam) == IDC_POPUPOPTDLG_LCLICK_ACTION) || (LOWORD(wParam) == IDC_POPUPOPTDLG_RCLICK_ACTION) || (LOWORD(wParam) == IDC_POPUPOPTDLG_BGCOLOUR) || (LOWORD(wParam) == IDC_POPUPOPTDLG_TEXTCOLOUR))
+					{
+						SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
+					}
+				} break;
+			}
+		} break;
+		case WM_DESTROY:
+		{
+			g_PopupOptPage.SetWnd(NULL);
+			return 0;
+		} break;
+	}
+	return 0;
+}
+
+
+int OptionsDlgInit(WPARAM wParam, LPARAM lParam)
+{
+	OPTIONSDIALOGPAGE optDi = {0};
+	optDi.cbSize = sizeof(optDi);
+	optDi.position = 920000000;
+	optDi.ptszTitle = LPGENT("ClientChangeNotify");
+	optDi.pfnDlgProc = PopupOptDlg;
+	optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);
+	optDi.hInstance = g_hInstance;
+	optDi.ptszGroup = LPGENT("PopUps");
+	optDi.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&optDi);
+	return 0;
+}
+
+
+void InitOptions()
+{
+	g_PopupOptPage.Items.AddElem(new COptItem_Checkbox(IDC_POPUPOPTDLG_POPUPNOTIFY, "PopupNotify", DBVT_BYTE, 1));
+	g_PopupOptPage.Items.AddElem(new COptItem_Checkbox(IDC_POPUPOPTDLG_SHOWPREVCLIENT, "ShowPrevClient", DBVT_BYTE, 0, 0, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Checkbox(IDC_POPUPOPTDLG_VERCHGNOTIFY, "VerChgNotify", DBVT_BYTE, 0, 0, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Checkbox(IDC_POPUPOPTDLG_SHOWVER, "ShowVer", DBVT_BYTE, 1, 0, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Checkbox(IDC_POPUPOPTDLG_USESTATUSNOTIFYFLAG, "UseStatusNotifyFlag", DBVT_BYTE, 1, 0, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_POPUPPREVIEW, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Combobox(IDC_POPUPOPTDLG_LCLICK_ACTION, "PopupLClickAction", DBVT_BYTE, POPUP_DEF_LCLICKACTION, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Combobox(IDC_POPUPOPTDLG_RCLICK_ACTION, "PopupRClickAction", DBVT_BYTE, POPUP_DEF_RCLICKACTION, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_LCLICK, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_RCLICK, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Colourpicker(IDC_POPUPOPTDLG_BGCOLOUR, "PopupBGColour", POPUP_DEF_POPUP_BGCOLOUR, IDC_POPUPOPTDLG_DEFBGCOLOUR));
+	g_PopupOptPage.Items.AddElem(new COptItem_Colourpicker(IDC_POPUPOPTDLG_TEXTCOLOUR, "PopupTextColour", POPUP_DEF_POPUP_TEXTCOLOUR, IDC_POPUPOPTDLG_DEFTEXTCOLOUR));
+	g_PopupOptPage.Items.AddElem(new COptItem_Checkbox(IDC_POPUPOPTDLG_DEFBGCOLOUR, "UseDefBGColour", DBVT_BYTE, POPUP_DEF_USEDEFBGCOLOUR, 0, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Checkbox(IDC_POPUPOPTDLG_DEFTEXTCOLOUR, "UseDefTextColour", DBVT_BYTE, POPUP_DEF_USEDEFTEXTCOLOUR, 0, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_BGCOLOUR, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_TEXTCOLOUR, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_IntEdit(IDC_POPUPOPTDLG_POPUPDELAY, "PopupDelay", DBVT_WORD, true, POPUP_DEF_POPUPDELAY, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_SEC, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_DEFAULT, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_INFINITE, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_IGNORESTRINGS, IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Edit(IDC_POPUPOPTDLG_IGNORESTRINGS, DB_IGNORESUBSTRINGS, IGNORESTRINGS_MAX_LEN, _T("gmail;skype;/Miranda[0-9A-F]{8}/"), IDC_POPUPOPTDLG_POPUPNOTIFY));
+	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_REGEXP, IDC_POPUPOPTDLG_POPUPNOTIFY));
+}
diff --git a/plugins/ClientChangeNotify/Resources.rc b/plugins/ClientChangeNotify/Resources.rc
new file mode 100644
index 0000000000..f1f5ebd0a1
--- /dev/null
+++ b/plugins/ClientChangeNotify/Resources.rc
@@ -0,0 +1,202 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Russian resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+#ifdef _WIN32
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_CCN_ERROR DIALOGEX 0, 0, 187, 87
+STYLE DS_ABSALIGN | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | 
+    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ClientChangeNotify error"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,66,66,50,14
+    CTEXT           "Fingerprint plugin not found.",IDC_STATIC,0,12,186,8
+    CTEXT           "ClientChangeNotify requires it to work properly.",
+                    IDC_STATIC,0,24,186,8
+    CONTROL         "Don't remind me anymore",IDC_DONTREMIND,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,12,48,174,10
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_CCN_ERROR, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 180
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 80
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Russian resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+    "LANGUAGE 9, 1\r\n"
+    "#pragma code_page(1252)\r\n"
+    "#include ""Resources.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#endif\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_POPUPOPTDLG DIALOGEX 0, 0, 303, 207
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | 
+    WS_CHILD
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Enable notification",IDC_POPUPOPTDLG_POPUPNOTIFY,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,6,294,10
+    CONTROL         "Show previous client name",
+                    IDC_POPUPOPTDLG_SHOWPREVCLIENT,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,6,18,294,10
+    CONTROL         "Notify also when just client version changes",
+                    IDC_POPUPOPTDLG_VERCHGNOTIFY,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,6,30,170,10
+    CONTROL         "Show client version",IDC_POPUPOPTDLG_SHOWVER,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,180,30,120,10
+    CONTROL         "Don't notify for contacts with disabled status notification",
+                    IDC_POPUPOPTDLG_USESTATUSNOTIFYFLAG,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,42,294,10
+    GROUPBOX        "Click action",-1,6,56,216,54
+    RTEXT           "On left click",IDC_POPUPOPTDLG_STATIC_LCLICK,11,71,55,8
+    COMBOBOX        IDC_POPUPOPTDLG_LCLICK_ACTION,73,68,144,30,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "On right click",IDC_POPUPOPTDLG_STATIC_RCLICK,11,89,55,
+                    8
+    COMBOBOX        IDC_POPUPOPTDLG_RCLICK_ACTION,73,86,144,30,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Delay",-1,229,56,66,54
+    EDITTEXT        IDC_POPUPOPTDLG_POPUPDELAY,234,68,32,12,ES_AUTOHSCROLL
+    CONTROL         "",IDC_POPUPOPTDLG_POPUPDELAY_SPIN,"msctls_updown32",
+                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 
+                    UDS_ARROWKEYS | UDS_NOTHOUSANDS,254,68,10,12
+    LTEXT           "Sec",IDC_POPUPOPTDLG_STATIC_SEC,269,70,21,8
+    CTEXT           "0 = Default",IDC_POPUPOPTDLG_STATIC_DEFAULT,234,84,54,8
+    CTEXT           "-1 = Infinite",IDC_POPUPOPTDLG_STATIC_INFINITE,234,96,
+                    54,8
+    GROUPBOX        "Colours",-1,6,116,156,48
+    CONTROL         "",IDC_POPUPOPTDLG_BGCOLOUR,"ColourPicker",WS_TABSTOP,13,
+                    128,19,12
+    LTEXT           "Background",IDC_POPUPOPTDLG_STATIC_BGCOLOUR,37,131,53,8
+    CONTROL         "Use default",IDC_POPUPOPTDLG_DEFBGCOLOUR,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,96,131,60,10
+    CONTROL         "",IDC_POPUPOPTDLG_TEXTCOLOUR,"ColourPicker",WS_TABSTOP,
+                    13,146,19,12
+    LTEXT           "Text",IDC_POPUPOPTDLG_STATIC_TEXTCOLOUR,37,149,53,8
+    CONTROL         "Use default",IDC_POPUPOPTDLG_DEFTEXTCOLOUR,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,96,149,60,10
+    PUSHBUTTON      "Preview",IDC_POPUPOPTDLG_POPUPPREVIEW,210,134,48,14
+    LTEXT           "Ignore these clients (separated by semicolons):",
+                    IDC_POPUPOPTDLG_STATIC_IGNORESTRINGS,6,168,294,8
+    EDITTEXT        IDC_POPUPOPTDLG_IGNORESTRINGS,6,180,288,14,
+                    ES_AUTOHSCROLL
+    CTEXT           "(you have to install pcre.dll or pcre3.dll to use regular expressions here)",
+                    IDC_POPUPOPTDLG_STATIC_REGEXP,0,195,294,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_POPUPOPTDLG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 296
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 200
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#include "Resources.rc2"  // non-Microsoft Visual C++ edited resources
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/plugins/ClientChangeNotify/Resources.rc2 b/plugins/ClientChangeNotify/Resources.rc2
new file mode 100644
index 0000000000..2a2e6517dd
--- /dev/null
+++ b/plugins/ClientChangeNotify/Resources.rc2
@@ -0,0 +1,59 @@
+//
+// RESOURCES.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#include "VersionNo.h"
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION FILEVER
+ PRODUCTVERSION PRODUCTVER
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x21L
+#else
+ FILEFLAGS 0x20L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Deathdemon"
+            VALUE "FileDescription", "ClientChangeNotify plugin for Miranda IM"
+            VALUE "FileVersion", STRFILEVER
+            VALUE "LegalCopyright", "� 2006-2008 Chervov Dmitry"
+#ifdef _UNICODE
+            VALUE "InternalName", "ClientChangeNotifyW"
+            VALUE "OriginalFilename", "ClientChangeNotifyW.dll"
+            VALUE "ProductName", "ClientChangeNotify (Unicode)"
+#else
+            VALUE "InternalName", "ClientChangeNotify"
+            VALUE "OriginalFilename", "ClientChangeNotify.dll"
+            VALUE "ProductName", "ClientChangeNotify (ANSI)"
+#endif
+            VALUE "ProductVersion", STRPRODUCTVER
+            VALUE "SpecialBuild", STRSPECIALBUILD
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ClientChangeNotify/VersionNo.h b/plugins/ClientChangeNotify/VersionNo.h
new file mode 100644
index 0000000000..a393471376
--- /dev/null
+++ b/plugins/ClientChangeNotify/VersionNo.h
@@ -0,0 +1,5 @@
+#define STRSPECIALBUILD	"62"
+#define FILEVER					0, 1, 1, 3
+#define STRFILEVER			"0, 1, 1, 3"
+#define PRODUCTVER			FILEVER
+#define STRPRODUCTVER		STRFILEVER
diff --git a/plugins/ClientChangeNotify/ccn_readme.txt b/plugins/ClientChangeNotify/ccn_readme.txt
new file mode 100644
index 0000000000..a365ce067c
--- /dev/null
+++ b/plugins/ClientChangeNotify/ccn_readme.txt
@@ -0,0 +1,81 @@
+ClientChangeNotify plugin for Miranda IM.
+(c) Chervov Dmitry aka Deathdemon.
+
+This plugin shows a notification when someone in your contact list changes his client.
+It requires Popup or YAPP plugin.
+
+"Ignore these clients" setting is a list of substrings separated by semicolons; if ClientChangeNotify finds one of these substrings in a new client name, it doesn't show the notification.
+Also it's possible to use regular expressions, but it requires pcre.dll or pcre3.dll in your miranda directory.
+PCRE is available from http://www.pcre.org/ (Binaries for Windows are here: http://gnuwin32.sourceforge.net/downlinks/pcre-bin-zip.php )
+When PCRE library is installed successfully, ClientChangeNotify will show "you can use regular expressions here" under the "Ignore these clients" field in the options.
+
+Regular expressions are detected by '/' symbol at the start of the substring. The same symbol must be at the end of the substring, possibly followed by pattern modifier characters. I.e. "gmail;/[0-9A-F]{8}(\W|$)/i;skype" has two usual substrings and one regexp substring with an "i" modifier (caseless).
+
+There are several solutions to filter jgmail client changes:
+1) Disable notification about client version changes
+(Miranda options -> Popups -> ClientChangeNotify -> "Notify also when just client version changes" checkbox, turn it off).
+This solution is somewhat easier, but ClientChangeNotify won't notify you of any client version changes.
+2) Disable client change notifications for separate contacts
+3) Install PCRE library (see the download link above), and make sure that substring "/[0-9A-F]{8}(\W|$)/" is present in the "Ignore these clients" field of the ClientChangeNotify options. If the substring is not there, add it.
+This solution is the most correct.
+
+ClientChangeNotify supports per-contact notification setting. There are two ways to use it: either by using ContactSettings plugin that adds a GUI to easily modify this setting, or by modifying the database directly:
+Contact/ClientChangeNotify/Notify (BYTE) =
+ 0 - completely disable notifications for this contact
+ 1 - show notifications always, except when ClientChangeNotify popups are turned off
+ 2 - show notifications always, even when ClientChangeNotify popups are turned off
+ 3 (default) - use global settings (the plugin will examine the following two checkboxes before deciding whether to show the notification: "Notify also when just client version changes" and "Don't notify for contacts with disabled status notification")
+
+Changelog
+=========
+
+v0.1.1.2 (build 61; Jan 12, 2008)
+--------
+ - workaround for contact lists bug with multiple submenu items when using a localization file
+
+v0.1.1.1 (build 60; Jan 2, 2008)
+--------
+ - added an item to the Popups submenu of the main menu to toggle client change notifications
+ - fixed regexp to ignore jgmail clients
+ - improved pcre library detection
+ - changed notification text formatting
+ - changes in ContactSettings API
+
+v0.1.1.0 (build 54; Sep 17, 2007)
+--------
+ - added support for Miranda 0.8. CCN interface is {E9D1F0D4-D65D-4840-87BD-59D7B4702C47}
+ - moved logging features to a separate plugin - LogService
+ - added possibility to ignore certain clients, also using regular expressions
+ - added per-contact setting to turn notifications on/off, and support for ContactSettings plugin
+ - some other minor improvements
+
+v0.1.0.9 (build 29; Jul 3, 2006)
+--------
+ - fixed non-working preview on some profiles
+ - fix to log unique ID of every protocol, not only ICQ UIN
+
+v0.1.0.8 (build 27; Jul 2, 2006)
+--------
+ - disabled notification for new contacts
+ - implemented unicode logging correctly
+
+v0.1.0.7 (build 24; May 2, 2006)
+--------
+ - unicode support
+ - some minor fixes
+
+v0.1.0.6 (build 22; Apr 15, 2006)
+--------
+ - fixed disappearing client icons in popups
+
+v0.1.0.5 (build 18; Apr 15, 2006)
+--------
+ - fixed a crash with some "unusual" clients
+
+v0.1.0.4 (build 17; Apr 14, 2006)
+--------
+ - Added a check whether Fingerprint plugin is installed or not. Now ClientChangeNotify can work without it, but with a limited functionality. It's still highly recommended to install Fingerprint.
+
+v0.1.0.2 (build 15; Apr 14, 2006)
+--------
+ - First public release.
+\ No newline at end of file
diff --git a/plugins/ClientChangeNotify/ccn_translation.txt b/plugins/ClientChangeNotify/ccn_translation.txt
new file mode 100644
index 0000000000..b58634963d
--- /dev/null
+++ b/plugins/ClientChangeNotify/ccn_translation.txt
@@ -0,0 +1,69 @@
+Miranda Language Pack Version 1
+Locale: 0809
+Authors: Deathdemon
+Author-email: dchervov@yahoo.com
+Last-Modified-Using: Miranda IM 0.7svn
+Plugins-included: ClientChangeNotify
+; Generated by lpgen on Sat Jan 12 20:13:17 2008
+; Translations: 51
+
+; Common strings that belong to many files
+;[ClientChangeNotify]
+;[PopUps]
+
+; C:/VSProjects/Miranda/plugins/ClientChangeNotify/ClientChangeNotify.cpp
+;[%s (was %s)]
+;[) changed client to ]
+;[Always except when client change notifications are disabled globally]
+;[Always, even when client change notifications are disabled globally]
+;[Client change notifications:]
+;[ClientChangeNotify (Unicode)]
+;[ClientChangeNotify: Client changed]
+;[Disable c&lient change notification]
+;[Enable c&lient change notification]
+;[Never, ignore client changes for this contact]
+;[The unicode version of ClientChangeNotify plugin requires db3x plugin version 0.5.1.0 or later]
+;[Use global settings (default)]
+;[`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%]
+;[changed client to %s]
+;[changed client to %s (was %s)]
+
+; C:/VSProjects/Miranda/plugins/ClientChangeNotify/Misc.h
+;[Can't open log file ]
+;[Error #%d]
+
+; C:/VSProjects/Miranda/plugins/ClientChangeNotify/OptDlg.cpp
+;[(you can use regular expressions here)]
+;[Close popup]
+;[Do nothing]
+;[Open contact details window]
+;[Open contact history]
+;[Open contact menu]
+;[Open log file]
+;[Open message window]
+
+; C:/VSProjects/Miranda/plugins/ClientChangeNotify/Resources.rc
+;[(you have to install pcre.dll or pcre3.dll to use regular expressions here)]
+;[-1 = Infinite]
+;[0 = Default]
+;[Background]
+;[Click action]
+;[ClientChangeNotify error]
+;[ClientChangeNotify requires it to work properly.]
+;[Colours]
+;[Delay]
+;[Don't notify for contacts with disabled status notification]
+;[Don't remind me anymore]
+;[Enable notification]
+;[Fingerprint plugin not found.]
+;[Ignore these clients (separated by semicolons):]
+;[Notify also when just client version changes]
+;[OK]
+;[On left click]
+;[On right click]
+;[Preview]
+;[Sec]
+;[Show client version]
+;[Show previous client name]
+;[Text]
+;[Use default]
diff --git a/plugins/ClientChangeNotify/copying.txt b/plugins/ClientChangeNotify/copying.txt
new file mode 100644
index 0000000000..45645b4b53
--- /dev/null
+++ b/plugins/ClientChangeNotify/copying.txt
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/plugins/ClientChangeNotify/resource.h b/plugins/ClientChangeNotify/resource.h
new file mode 100644
index 0000000000..e9a86ee449
--- /dev/null
+++ b/plugins/ClientChangeNotify/resource.h
@@ -0,0 +1,42 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Resources.rc
+//
+#define IDD_POPUPOPTDLG                 101
+#define IDD_CCN_ERROR                   103
+#define IDC_POPUPOPTDLG_POPUPNOTIFY     1002
+#define IDC_POPUPOPTDLG_BGCOLOUR        1003
+#define IDC_POPUPOPTDLG_TEXTCOLOUR      1004
+#define IDC_POPUPOPTDLG_LCLICK_ACTION   1005
+#define IDC_POPUPOPTDLG_RCLICK_ACTION   1006
+#define IDC_POPUPOPTDLG_POPUPPREVIEW    1007
+#define IDC_POPUPOPTDLG_DEFBGCOLOUR     1013
+#define IDC_POPUPOPTDLG_DEFTEXTCOLOUR   1014
+#define IDC_POPUPOPTDLG_STATIC_LCLICK   1016
+#define IDC_POPUPOPTDLG_STATIC_RCLICK   1017
+#define IDC_POPUPOPTDLG_STATIC_BGCOLOUR 1018
+#define IDC_POPUPOPTDLG_STATIC_TEXTCOLOUR 1019
+#define IDC_POPUPOPTDLG_POPUPDELAY      1020
+#define IDC_POPUPOPTDLG_STATIC_SEC      1021
+#define IDC_POPUPOPTDLG_STATIC_DEFAULT  1022
+#define IDC_POPUPOPTDLG_STATIC_INFINITE 1023
+#define IDC_POPUPOPTDLG_POPUPDELAY_SPIN 1024
+#define IDC_POPUPOPTDLG_VERCHGNOTIFY    1025
+#define IDC_POPUPOPTDLG_SHOWPREVCLIENT  1026
+#define IDC_POPUPOPTDLG_USESTATUSNOTIFYFLAG 1032
+#define IDC_POPUPOPTDLG_SHOWVER         1033
+#define IDC_DONTREMIND                  1034
+#define IDC_POPUPOPTDLG_IGNORESTRINGS   1035
+#define IDC_POPUPOPTDLG_STATIC_IGNORESTRINGS 1036
+#define IDC_POPUPOPTDLG_STATIC_REGEXP   1037
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        104
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/plugins/NewAwaySysMod/CommonLibs/CString.cpp b/plugins/CommonLibs/CString.cpp
index b2a60cbbec..87266513d0 100644
--- a/plugins/NewAwaySysMod/CommonLibs/CString.cpp
+++ b/plugins/CommonLibs/CString.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#define _CRT_SECURE_NO_WARNINGS
+#include "Common.h"
 #include "CString.h"
 
 #define STR_GROWBY 64
diff --git a/plugins/NewAwaySysMod/CommonLibs/CString.h b/plugins/CommonLibs/CString.h
index ed2540c511..ed2540c511 100644
--- a/plugins/NewAwaySysMod/CommonLibs/CString.h
+++ b/plugins/CommonLibs/CString.h
diff --git a/plugins/NewAwaySysMod/CommonLibs/GroupCheckbox.cpp b/plugins/CommonLibs/GroupCheckbox.cpp
index 3add46753e..20276fcbf3 100644
--- a/plugins/NewAwaySysMod/CommonLibs/GroupCheckbox.cpp
+++ b/plugins/CommonLibs/GroupCheckbox.cpp
@@ -17,6 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include "Common.h"
 #include "GroupCheckbox.h"
 #include "Themes.h"
 
diff --git a/plugins/NewAwaySysMod/CommonLibs/GroupCheckbox.h b/plugins/CommonLibs/GroupCheckbox.h
index 3aa121f869..3aa121f869 100644
--- a/plugins/NewAwaySysMod/CommonLibs/GroupCheckbox.h
+++ b/plugins/CommonLibs/GroupCheckbox.h
diff --git a/plugins/NewAwaySysMod/CommonLibs/Options.cpp b/plugins/CommonLibs/Options.cpp
index 0de5c1617a..7e7f9a23e1 100644
--- a/plugins/NewAwaySysMod/CommonLibs/Options.cpp
+++ b/plugins/CommonLibs/Options.cpp
@@ -17,6 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include "Common.h"
 #include "Options.h"
 
 static CString sEmptyString("");
@@ -423,7 +424,7 @@ void COptItem_TreeCtrl::MemToDB(CString &sModule, CString *sDBSettingPrefix)
 		for (I = 0; I < Value.GetSize(); I++)
 		{
 			CString StrID;
-			itoa(Value[I].ID, StrID.GetBuffer(64), 10);
+			_itoa(Value[I].ID, StrID.GetBuffer(64), 10);
 			StrID.ReleaseBuffer();
 			DBWriteContactSettingTString(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, Value[I].Title);
 			if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL))
@@ -861,7 +862,7 @@ void COptItem_ListCtrl::MemToDB(CString &sModule, CString *sDBSettingPrefix)
 		for (I = 0; I < Value.GetSize(); I++)
 		{
 			CString StrID;
-			itoa(I, StrID.GetBuffer(64), 10);
+			_itoa(I, StrID.GetBuffer(64), 10);
 			StrID.ReleaseBuffer();
 			DBWriteContactSettingTString(NULL, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, Value[I].Text);
 		}
diff --git a/plugins/NewAwaySysMod/CommonLibs/Options.h b/plugins/CommonLibs/Options.h
index 61cbc11d04..1b3bb0a284 100644
--- a/plugins/NewAwaySysMod/CommonLibs/Options.h
+++ b/plugins/CommonLibs/Options.h
@@ -19,13 +19,6 @@
 
 #pragma once
 
-#include <windows.h>
-#include <crtdbg.h>
-#include <commctrl.h>
-#include <stdio.h>
-#include "newpluginapi.h"
-#include "m_database.h"
-#include "m_utils.h"
 #include "CString.h"
 #include "TMyArray.h"
 
diff --git a/plugins/NewAwaySysMod/CommonLibs/TMyArray.h b/plugins/CommonLibs/TMyArray.h
index 68ca908fe1..68ca908fe1 100644
--- a/plugins/NewAwaySysMod/CommonLibs/TMyArray.h
+++ b/plugins/CommonLibs/TMyArray.h
diff --git a/plugins/NewAwaySysMod/CommonLibs/ThemedImageCheckbox.cpp b/plugins/CommonLibs/ThemedImageCheckbox.cpp
index dbdac0bb11..ea0fbcea0a 100644
--- a/plugins/NewAwaySysMod/CommonLibs/ThemedImageCheckbox.cpp
+++ b/plugins/CommonLibs/ThemedImageCheckbox.cpp
@@ -17,6 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include "Common.h"
 #include "ThemedImageCheckbox.h"
 #include "Themes.h"
 #include "win2k.h"
diff --git a/plugins/NewAwaySysMod/CommonLibs/ThemedImageCheckbox.h b/plugins/CommonLibs/ThemedImageCheckbox.h
index f3449ec8fc..f3449ec8fc 100644
--- a/plugins/NewAwaySysMod/CommonLibs/ThemedImageCheckbox.h
+++ b/plugins/CommonLibs/ThemedImageCheckbox.h
diff --git a/plugins/NewAwaySysMod/CommonLibs/Themes.cpp b/plugins/CommonLibs/Themes.cpp
index d8213453b5..359d226b13 100644
--- a/plugins/NewAwaySysMod/CommonLibs/Themes.cpp
+++ b/plugins/CommonLibs/Themes.cpp
@@ -17,11 +17,10 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include "Common.h"
 #include "Themes.h"
 #include <tchar.h>
 
-#define IsWinVerXPPlus() (LOBYTE(LOWORD(GetVersion())) >= 5 && LOWORD(GetVersion()) != 5)
-
 tOpenThemeData pOpenThemeData = NULL;
 tCloseThemeData pCloseThemeData = NULL;
 tDrawThemeBackground pDrawThemeBackground = NULL;
diff --git a/plugins/NewAwaySysMod/CommonLibs/Themes.h b/plugins/CommonLibs/Themes.h
index 524c7514a5..524c7514a5 100644
--- a/plugins/NewAwaySysMod/CommonLibs/Themes.h
+++ b/plugins/CommonLibs/Themes.h
diff --git a/plugins/NewAwaySysMod/CommonLibs/pcre.cpp b/plugins/CommonLibs/pcre.cpp
index 6800a71418..5bd85833d9 100644
--- a/plugins/NewAwaySysMod/CommonLibs/pcre.cpp
+++ b/plugins/CommonLibs/pcre.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#define CHARARRAY_CONVERT
-
-#include "..\NewAwaySys\common.h"
+#include "common.h"
 #include <windows.h>
 #include <stdio.h>
 #include <crtdbg.h>
@@ -94,48 +92,37 @@ TCString CompileRegexp(TCString Regexp, int bAddAsUsualSubstring, int ID)
 				Flags = 0;
 				while (++p < pRegexpEnd)
 				{
-					switch (*p)
-					{
-						case 'i':
-						{
-							Flags |= PCRE_CASELESS;
-						} break;
-						case 'm':
-						{
-							Flags |= PCRE_MULTILINE;
-						} break;
-						case 's':
-						{
-							Flags |= PCRE_DOTALL;
-						} break;
-						case 'x':
-						{
-							Flags |= PCRE_EXTENDED;
-						} break;
-						case 'A':
-						{
-							Flags |= PCRE_ANCHORED;
-						} break;
-						case 'f':
-						{
-							Flags |= PCRE_FIRSTLINE;
-						} break;
-						case 'D':
-						{
-							Flags |= PCRE_DOLLAR_ENDONLY;
-						} break;
-						case 'U':
-						{
-							Flags |= PCRE_UNGREEDY;
-						} break;
-						case 'X':
-						{
-							Flags |= PCRE_EXTRA;
-						} break;
-						default:
-						{
-							Result += LogMessage(TranslateT("Warning, unknown pattern modifier '%c':\n%s"), *p, (TCHAR*)OrigRegexp) + _T("\n\n");
-						} break;
+					switch (*p) {
+					case 'i':
+						Flags |= PCRE_CASELESS;
+						break;
+					case 'm':
+						Flags |= PCRE_MULTILINE;
+						break;
+					case 's':
+						Flags |= PCRE_DOTALL;
+						break;
+					case 'x':
+						Flags |= PCRE_EXTENDED;
+						break;
+					case 'A':
+						Flags |= PCRE_ANCHORED;
+						break;
+					case 'f':
+						Flags |= PCRE_FIRSTLINE;
+						break;
+					case 'D':
+						Flags |= PCRE_DOLLAR_ENDONLY;
+						break;
+					case 'U':
+						Flags |= PCRE_UNGREEDY;
+						break;
+					case 'X':
+						Flags |= PCRE_EXTRA;
+						break;
+					default:
+						// Result += LogMessage(Translate("Warning, unknown pattern modifier '%c':\n"), *p );
+						break;
 					}
 				}
 			}
@@ -146,22 +133,18 @@ TCString CompileRegexp(TCString Regexp, int bAddAsUsualSubstring, int ID)
 #else
 		PcreCompileData[NewID].pPcre = pcre_compile(Regexp, Flags, &Err, &ErrOffs, NULL);
 #endif
-		if (PcreCompileData[NewID].pPcre)
-		{
+		if (PcreCompileData[NewID].pPcre) {
 			PcreCompileData[NewID].pExtra = NULL;
 			if (pcre_study)
-			{
 				PcreCompileData[NewID].pExtra = pcre_study(PcreCompileData[NewID].pPcre, 0, &Err);
-			}
-		} else
-		{
-			Result += LogMessage(TranslateT("Syntax error in regexp\n%s\nat offset %d: %s."), (TCHAR*)Regexp, ErrOffs, (TCHAR*)ANSI2TCHAR(Err)) + _T("\n\n");
+		} 
+		else {
+			// Result += LogMessage(TranslateT("Syntax error in regexp\n%s\nat offset %d: %s."), (TCHAR*)Regexp, ErrOffs, (TCHAR*)ANSI2TCHAR(Err)) + _T("\n\n");
 			PcreCompileData[NewID].Pattern = Regexp;
 	 	}
-	} else
-	{
-		PcreCompileData[NewID].Pattern = Regexp;
-	}
+	} 
+	else PcreCompileData[NewID].Pattern = Regexp;
+
 	return Result;
 }
 
diff --git a/plugins/NewAwaySysMod/CommonLibs/pcre.h b/plugins/CommonLibs/pcre.h
index 2663870f85..2663870f85 100644
--- a/plugins/NewAwaySysMod/CommonLibs/pcre.h
+++ b/plugins/CommonLibs/pcre.h
diff --git a/plugins/NewAwaySysMod/CommonLibs/pcre_main.h b/plugins/CommonLibs/pcre_main.h
index ca6e7449df..ca6e7449df 100644
--- a/plugins/NewAwaySysMod/CommonLibs/pcre_main.h
+++ b/plugins/CommonLibs/pcre_main.h
diff --git a/plugins/NewAwaySysMod/AwayOpt.cpp b/plugins/NewAwaySysMod/AwayOpt.cpp
index cf263c5cfe..87aa20f4d9 100644
--- a/plugins/NewAwaySysMod/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/AwayOpt.cpp
@@ -23,9 +23,9 @@
 #include "Path.h"
 #include "m_button.h"
 #include "m_clc.h"
-#include ".\CommonLibs\Themes.h"
-#include ".\CommonLibs\GroupCheckbox.h"
-#include ".\CommonLibs\ThemedImageCheckbox.h"
+#include "..\CommonLibs\Themes.h"
+#include "..\CommonLibs\GroupCheckbox.h"
+#include "..\CommonLibs\ThemedImageCheckbox.h"
 
 //NightFox
 #include <m_modernopt.h>
diff --git a/plugins/NewAwaySysMod/Common.h b/plugins/NewAwaySysMod/Common.h
index 52df7ac67d..732577421f 100644
--- a/plugins/NewAwaySysMod/Common.h
+++ b/plugins/NewAwaySysMod/Common.h
@@ -30,6 +30,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <CommCtrl.h>
 #include <commdlg.h>
 #include <time.h>
 #include <shellapi.h>
@@ -65,8 +66,8 @@
 //#include "m_popupw.h"
 #include "m_metacontacts.h"
 #include "m_LogService.h"
-#include ".\CommonLibs\CString.h"
-#include ".\CommonLibs\Options.h"
+#include "..\CommonLibs\CString.h"
+#include "..\CommonLibs\Options.h"
 
 
 #pragma comment(lib,"comctl32.lib")
diff --git a/plugins/NewAwaySysMod/NewAwaySys.vcxproj b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
index 2ab89a2e58..775e96fa8a 100644
--- a/plugins/NewAwaySysMod/NewAwaySys.vcxproj
+++ b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
@@ -59,12 +59,12 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -106,14 +106,14 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>
       </DebugInformationFormat>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
+      <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -147,31 +147,34 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="AwayOpt.cpp" />
-    <ClCompile Include="AwaySys.cpp" />
+    <ClCompile Include="AwaySys.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="Client.cpp" />
     <ClCompile Include="ContactList.cpp" />
-    <ClCompile Include=".\CommonLibs\CString.cpp" />
-    <ClCompile Include=".\CommonLibs\GroupCheckbox.cpp" />
+    <ClCompile Include="..\CommonLibs\CString.cpp" />
+    <ClCompile Include="..\CommonLibs\GroupCheckbox.cpp" />
     <ClCompile Include="MsgEventAdded.cpp" />
     <ClCompile Include="MsgTree.cpp" />
     <ClCompile Include="Notification.cpp" />
-    <ClCompile Include=".\CommonLibs\Options.cpp" />
+    <ClCompile Include="..\CommonLibs\Options.cpp" />
     <ClCompile Include="Properties.cpp" />
     <ClCompile Include="ReadAwayMsg.cpp" />
     <ClCompile Include="Services.cpp" />
     <ClCompile Include="SetAwayMsg.cpp" />
-    <ClCompile Include=".\CommonLibs\ThemedImageCheckbox.cpp" />
-    <ClCompile Include=".\CommonLibs\Themes.cpp" />
+    <ClCompile Include="..\CommonLibs\ThemedImageCheckbox.cpp" />
+    <ClCompile Include="..\CommonLibs\Themes.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AggressiveOptimize.h" />
     <ClInclude Include="Common.h" />
     <ClInclude Include="ContactList.h" />
-    <ClInclude Include=".\CommonLibs\CString.h" />
-    <ClInclude Include=".\CommonLibs\GroupCheckbox.h" />
-    <ClInclude Include=".\CommonLibs\m_ContactSettings.h" />
-    <ClInclude Include=".\CommonLibs\m_LogService.h" />
-    <ClInclude Include=".\CommonLibs\m_NewAwaySys.h" />
+    <ClInclude Include="..\CommonLibs\CString.h" />
+    <ClInclude Include="..\CommonLibs\GroupCheckbox.h" />
+    <ClInclude Include="..\CommonLibs\m_ContactSettings.h" />
+    <ClInclude Include="..\CommonLibs\m_LogService.h" />
+    <ClInclude Include="..\CommonLibs\m_NewAwaySys.h" />
     <ClInclude Include="m_popup.h" />
     <ClInclude Include="m_popupw.h" />
     <ClInclude Include="m_statusplugins.h" />
@@ -179,14 +182,14 @@
     <ClInclude Include="m_updater.h" />
     <ClInclude Include="m_variables.h" />
     <ClInclude Include="MsgTree.h" />
-    <ClInclude Include=".\CommonLibs\Options.h" />
+    <ClInclude Include="..\CommonLibs\Options.h" />
     <ClInclude Include="Path.h" />
     <ClInclude Include="Properties.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="Services.h" />
-    <ClInclude Include=".\CommonLibs\ThemedImageCheckbox.h" />
-    <ClInclude Include=".\CommonLibs\Themes.h" />
-    <ClInclude Include=".\CommonLibs\TMyArray.h" />
+    <ClInclude Include="..\CommonLibs\ThemedImageCheckbox.h" />
+    <ClInclude Include="..\CommonLibs\Themes.h" />
+    <ClInclude Include="..\CommonLibs\TMyArray.h" />
     <ClInclude Include="VersionNo.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/plugins/NewAwaySysMod/NewAwaySys.vcxproj.filters b/plugins/NewAwaySysMod/NewAwaySys.vcxproj.filters
index 1755562518..02b3974903 100644
--- a/plugins/NewAwaySysMod/NewAwaySys.vcxproj.filters
+++ b/plugins/NewAwaySysMod/NewAwaySys.vcxproj.filters
@@ -51,19 +51,19 @@
     <ClCompile Include="SetAwayMsg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include=".\CommonLibs\CString.cpp">
+    <ClCompile Include="..\CommonLibs\CString.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include=".\CommonLibs\GroupCheckbox.cpp">
+    <ClCompile Include="..\CommonLibs\GroupCheckbox.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include=".\CommonLibs\Options.cpp">
+    <ClCompile Include="..\CommonLibs\Options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include=".\CommonLibs\ThemedImageCheckbox.cpp">
+    <ClCompile Include="..\CommonLibs\ThemedImageCheckbox.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include=".\CommonLibs\Themes.cpp">
+    <ClCompile Include="..\CommonLibs\Themes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -113,31 +113,31 @@
     <ClInclude Include="VersionNo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\CString.h">
+    <ClInclude Include="..\CommonLibs\CString.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\GroupCheckbox.h">
+    <ClInclude Include="..\CommonLibs\GroupCheckbox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\m_ContactSettings.h">
+    <ClInclude Include="..\CommonLibs\m_ContactSettings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\m_LogService.h">
+    <ClInclude Include="..\CommonLibs\m_LogService.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\m_NewAwaySys.h">
+    <ClInclude Include="..\CommonLibs\m_NewAwaySys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\Options.h">
+    <ClInclude Include="..\CommonLibs\Options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\ThemedImageCheckbox.h">
+    <ClInclude Include="..\CommonLibs\ThemedImageCheckbox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\Themes.h">
+    <ClInclude Include="..\CommonLibs\Themes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include=".\CommonLibs\TMyArray.h">
+    <ClInclude Include="..\CommonLibs\TMyArray.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/plugins/NewAwaySysMod/Path.h b/plugins/NewAwaySysMod/Path.h
index 5577d14063..e64b7ceb3c 100644
--- a/plugins/NewAwaySysMod/Path.h
+++ b/plugins/NewAwaySysMod/Path.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "m_utils.h"
-#include ".\CommonLibs\CString.h"
+#include "..\CommonLibs\CString.h"
 
 
 __inline TCString Path_ToRelative(TCString &Path)
author	George Hazan <george.hazan@gmail.com>	2012-05-21 15:17:41 +0000
committer	George Hazan <george.hazan@gmail.com>	2012-05-21 15:17:41 +0000
commit	49f4cab93b2f50a8132c6b8c26f1535f4f9ebb63 (patch)
tree	e4513a951782643b319f5f286994481030abb450
parent	c44981c03b71364fc42125594447d142ed9ed442 (diff)