core: copyright update to year 2013

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

25 files changed, 191 insertions, 169 deletions

diff --git a/src/modules/clist/Docking.cpp b/src/modules/clist/Docking.cpp
index d2695ef6b6..40e147ee1a 100644
--- a/src/modules/clist/Docking.cpp
+++ b/src/modules/clist/Docking.cpp
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -35,13 +36,13 @@ static POINT dockPos;
 

 static void Docking_GetMonitorRectFromPoint(LPPOINT pt, LPRECT rc)

 {

-	if (MyMonitorFromPoint) 

+	if (MyMonitorFromPoint)

 	{

 		MONITORINFO monitorInfo;

 		HMONITOR hMonitor = MyMonitorFromPoint(*pt, MONITOR_DEFAULTTONEAREST); // always returns a valid value

 		monitorInfo.cbSize = sizeof(monitorInfo);

 

-		if (MyGetMonitorInfo(hMonitor, &monitorInfo)) 

+		if (MyGetMonitorInfo(hMonitor, &monitorInfo))

 		{

 			*rc = monitorInfo.rcMonitor;

 			return;

@@ -57,9 +58,9 @@ static void Docking_GetMonitorRectFromPoint(LPPOINT pt, LPRECT rc)
 

 static void Docking_RectToDock(LPRECT rc)

 {

-	rc->right += dockPos.x - rc->left; 

+	rc->right += dockPos.x - rc->left;

 	rc->left = dockPos.x;

-	rc->bottom += dockPos.y - rc->top; 

+	rc->bottom += dockPos.y - rc->top;

 	rc->top = dockPos.y;

 }

 

@@ -91,7 +92,7 @@ static void Docking_AdjustPosition(HWND hwnd, LPRECT rcDisplay, LPRECT rc, bool
 

 	rc->top = rcDisplay->top;

 	rc->bottom = rcDisplay->bottom;

-	if (docked == DOCKED_LEFT) 

+	if (docked == DOCKED_LEFT)

 	{

 		rc->right = rcDisplay->left + (rc->right - rc->left);

 		rc->left = rcDisplay->left;

@@ -108,7 +109,7 @@ static void Docking_AdjustPosition(HWND hwnd, LPRECT rcDisplay, LPRECT rc, bool
 	else

 		rc->left = rc->right - cx;

 

-	if ( !query) 

+	if ( !query)

 	{

 		Docking_PosCommand(hwnd, rc, false);

 		dockPos = *(LPPOINT)rc;

@@ -116,7 +117,7 @@ static void Docking_AdjustPosition(HWND hwnd, LPRECT rcDisplay, LPRECT rc, bool
 

 	if (move)

 	{

-		MoveWindow(hwnd, rc->left, rc->top, rc->right - rc->left, 

+		MoveWindow(hwnd, rc->left, rc->top, rc->right - rc->left,

 			rc->bottom - rc->top, TRUE);

 	}

 }

@@ -145,7 +146,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam)
 	static int draggingTitle;

 	MSG *msg = (MSG *) wParam;

 

-	if (msg->message == WM_DESTROY) 

+	if (msg->message == WM_DESTROY)

 	{

 		if (docked)

 		{

@@ -168,7 +169,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam)
 	{

 	case WM_CREATE:

 		draggingTitle = 0;

-		docked = db_get_b(NULL, "CLUI", "DockToSides", 1) ? 

+		docked = db_get_b(NULL, "CLUI", "DockToSides", 1) ?

 			(char) db_get_b(NULL, "CList", "Docked", 0) : 0;

 		dockPos.x = (int)db_get_dw(NULL, "CList", "DockX", 0);

 		dockPos.y = (int)db_get_dw(NULL, "CList", "DockY", 0);

@@ -282,7 +283,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam)
 			ptCursor.y = GET_Y_LPARAM(pos);

 			Docking_GetMonitorRectFromPoint(&ptCursor, &rcMonitor);

 

-			if (((ptCursor.x < rcMonitor.left + EDGESENSITIVITY) || 

+			if (((ptCursor.x < rcMonitor.left + EDGESENSITIVITY) ||

 				(ptCursor.x >= rcMonitor.right - EDGESENSITIVITY)) &&

 				db_get_b(NULL, "CLUI", "DockToSides", 1))

 			{

@@ -340,18 +341,18 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam)
 			RECT rc;

 			POINT pt;

 			GetClientRect(msg->hwnd, &rc);

-			if ((docked == DOCKED_LEFT && (short) LOWORD(msg->lParam) > rc.right)  || 

-				(docked == DOCKED_RIGHT && (short) LOWORD(msg->lParam) < 0)) 

+			if ((docked == DOCKED_LEFT && (short) LOWORD(msg->lParam) > rc.right)  ||

+				(docked == DOCKED_RIGHT && (short) LOWORD(msg->lParam) < 0))

 			{

 				ReleaseCapture();

 				draggingTitle = 0;

 				docked = 0;

 				GetCursorPos(&pt);

 				PostMessage(msg->hwnd, WM_NCLBUTTONDOWN, HTCAPTION, MAKELPARAM(pt.x, pt.y));

-				SetWindowPos(msg->hwnd, 0, pt.x - rc.right / 2, 

-					pt.y - GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYSMCAPTION) / 2, 

-					db_get_dw(NULL, "CList", "Width", 0), 

-					db_get_dw(NULL, "CList", "Height", 0), 

+				SetWindowPos(msg->hwnd, 0, pt.x - rc.right / 2,

+					pt.y - GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYSMCAPTION) / 2,

+					db_get_dw(NULL, "CList", "Width", 0),

+					db_get_dw(NULL, "CList", "Height", 0),

 					SWP_NOZORDER);

 				Docking_Command(msg->hwnd, ABM_REMOVE);

 			}

diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp
index b3af146add..f914547fda 100644
--- a/src/modules/clist/clc.cpp
+++ b/src/modules/clist/clc.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -245,7 +246,7 @@ void UnloadClcModule()
 	FreeDisplayNameCache();

 

 	UninitCustomMenus();

-	UnitGenMenu();	

+	UnitGenMenu();

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -520,7 +521,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 			// this means an offline msg is flashing, so the contact should be shown

 			DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);

 			shouldShow = (style & CLS_SHOWHIDDEN || !db_get_b((HANDLE)wParam, "CList", "Hidden", 0))

-				&& ( !cli.pfnIsHiddenMode(dat, status) || CallService(MS_CLIST_GETCONTACTICON, wParam, 0) != lParam); 

+				&& ( !cli.pfnIsHiddenMode(dat, status) || CallService(MS_CLIST_GETCONTACTICON, wParam, 0) != lParam);

 

 			contact = NULL;

 			group = NULL;

@@ -589,7 +590,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 	case INTM_NOTONLISTCHANGED:

 		if ( !cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

 			break;

-		

+

 		if (contact->type == CLCIT_CONTACT) {

 			DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING *) lParam;

 			if (dbcws->value.type == DBVT_DELETED || dbcws->value.bVal == 0)

@@ -661,7 +662,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{

 			PAINTSTRUCT ps;

 			HDC hdc = BeginPaint(hwnd, &ps);

-			/* we get so many cli.pfnInvalidateRect()'s that there is no point painting, 

+			/* we get so many cli.pfnInvalidateRect()'s that there is no point painting,

 			Windows in theory shouldn't queue up WM_PAINTs in this case but it does so

 			we'll just ignore them */

 			if (IsWindowVisible(hwnd))

@@ -1303,7 +1304,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		case POPUP_GROUPHIDEOFFLINE:

 			if (contact->type != CLCIT_GROUP)

 				break;

-			CallService(MS_CLIST_GROUPSETFLAGS, contact->groupId, 

+			CallService(MS_CLIST_GROUPSETFLAGS, contact->groupId,

 				MAKELPARAM(contact->group->hideOffline ? 0 : GROUPF_HIDEOFFLINE, GROUPF_HIDEOFFLINE));

 			break;

 		}

diff --git a/src/modules/clist/clc.h b/src/modules/clist/clc.h
index 3604775adb..1e259be92d 100644
--- a/src/modules/clist/clc.h
+++ b/src/modules/clist/clc.h
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, 

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp
index c33bc23334..05ef5b36a7 100644
--- a/src/modules/clist/clcfiledrop.cpp
+++ b/src/modules/clist/clcfiledrop.cpp
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 #include <shlobj.h>

@@ -29,7 +30,7 @@ struct CDropTarget : IDropTarget
 	LONG refCount;

 	IDropTargetHelper *pDropTargetHelper;

 

-	ULONG STDMETHODCALLTYPE AddRef(void); 

+	ULONG STDMETHODCALLTYPE AddRef(void);

 	ULONG STDMETHODCALLTYPE Release(void);

 	HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject);

 

@@ -253,7 +254,7 @@ static VOID CALLBACK CreateDropTargetHelperTimerProc(HWND hwnd, UINT, UINT_PTR i
 {

 	KillTimer(hwnd, idEvent);

 	//This is a ludicrously slow function (~200ms) so we delay load it a bit.

-	if (S_OK != CoCreateInstance(CLSID_DragDropHelper, NULL, CLSCTX_INPROC_SERVER, 

+	if (S_OK != CoCreateInstance(CLSID_DragDropHelper, NULL, CLSCTX_INPROC_SERVER,

 		IID_IDropTargetHelper, (LPVOID*)&dropTarget.pDropTargetHelper))

 		dropTarget.pDropTargetHelper = NULL;

 }

diff --git a/src/modules/clist/clcidents.cpp b/src/modules/clist/clcidents.cpp
index 390c704325..a65e3a6d6f 100644
--- a/src/modules/clist/clcidents.cpp
+++ b/src/modules/clist/clcidents.cpp
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -98,7 +99,7 @@ int fnFindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contac
 			&& ((unsigned) hItem & ~HCONTACT_ISGROUP) == group->cl.items[group->scanIndex]->groupId) || (IsHContactContact(hItem)

 			&& group->cl.items[group->scanIndex]->type == CLCIT_CONTACT

 			&& group->cl.items[group->scanIndex]->hContact == hItem) || (IsHContactInfo(hItem)

-			&& group->cl.items[group->scanIndex]->type == CLCIT_INFO 

+			&& group->cl.items[group->scanIndex]->type == CLCIT_INFO

 			&& group->cl.items[group->scanIndex]->hContact == (HANDLE) ((UINT_PTR)hItem & ~HCONTACT_ISINFO)))

 		{

 			if (isVisible) {

@@ -144,9 +145,9 @@ int fnGetRowByIndex(struct ClcData *dat, int testindex, ClcContact **contact, Cl
 	int index = 0;

 	ClcGroup *group = &dat->list;

 

-	if (testindex<0) 

+	if (testindex<0)

 		return (-1);

-		

+

 	group->scanIndex = 0;

 	for (;;) {

 		if (group->scanIndex == group->cl.count) {

diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
index 4619ba6c4b..d4b8e83a4e 100644
--- a/src/modules/clist/clcitems.cpp
+++ b/src/modules/clist/clcitems.cpp
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -332,7 +333,7 @@ void fnDeleteItemFromTree(HWND hwnd, HANDLE hItem)
 				break;

 			if (group->cl.items[i]->type == CLCIT_GROUP) {

 				int len = lstrlen(group->cl.items[i]->szText);

-				if ( !_tcsncmp(group->cl.items[i]->szText, dbv.ptszVal + nameOffset, len) && 

+				if ( !_tcsncmp(group->cl.items[i]->szText, dbv.ptszVal + nameOffset, len) &&

 					 (dbv.ptszVal[nameOffset + len] == '\\' || dbv.ptszVal[nameOffset + len] == '\0')) {

 					group->totalMembers--;

 					if (dbv.ptszVal[nameOffset + len] == '\0')

@@ -383,12 +384,12 @@ void fnRebuildEntireList(HWND hwnd, struct ClcData *dat)
 

 			if (group != NULL) {

 				group->totalMembers++;

-				

+

 				if (dat->filterSearch && dat->szQuickSearch[0] != '\0') {

 					TCHAR *name = cli.pfnGetContactDisplayName(hContact, GCDNF_TCHAR);

 					TCHAR *lowered_name = CharLowerW(NEWTSTR_ALLOCA(name));

 					TCHAR *lowered_search = CharLowerW(NEWTSTR_ALLOCA(dat->szQuickSearch));

-					

+

 					if (_tcsstr(lowered_name, lowered_search))

 						cli.pfnAddContactToGroup(dat, group, hContact);

 				} else if ( !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {

diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp
index b772f3bad0..ccde719557 100644
--- a/src/modules/clist/clcmsgs.cpp
+++ b/src/modules/clist/clcmsgs.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp
index f5ef96f917..fb5053bd00 100644
--- a/src/modules/clist/clcutils.cpp
+++ b/src/modules/clist/clcutils.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -85,7 +86,7 @@ int fnHitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact *
 

 		POINT pt1 = pt;

 		ScreenToClient(hwndParent, &pt1);

-		HWND h = ChildWindowFromPointEx(hwndParent ? hwndParent : GetDesktopWindow(), 

+		HWND h = ChildWindowFromPointEx(hwndParent ? hwndParent : GetDesktopWindow(),

 			pt1, CWP_SKIPINVISIBLE | CWP_SKIPTRANSPARENT);

 		if (h != hwndTemp)

 		{

@@ -416,7 +417,7 @@ void fnEndRename(HWND, struct ClcData *dat, int save)
 				if (contact->type == CLCIT_GROUP) {

 					if (contact->group->parent && contact->group->parent->parent) {

 						TCHAR szFullName[256];

-						mir_sntprintf(szFullName, SIZEOF(szFullName), _T("%s\\%s"), 

+						mir_sntprintf(szFullName, SIZEOF(szFullName), _T("%s\\%s"),

 							cli.pfnGetGroupName(contact->group->parent->groupId, NULL), text);

 						cli.pfnRenameGroup(contact->groupId, szFullName);

 					}

diff --git a/src/modules/clist/clistcore.cpp b/src/modules/clist/clistcore.cpp
index 19fb928247..d69a1a77db 100644
--- a/src/modules/clist/clistcore.cpp
+++ b/src/modules/clist/clistcore.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, 

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp
index 253381b4a9..c7a58737a1 100644
--- a/src/modules/clist/clistevents.cpp
+++ b/src/modules/clist/clistevents.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -90,14 +91,14 @@ static void ShowEventsInTray()
 	char ** pTrayProtos;

 	char nTrayProtoCnt;

 	int nTrayCnt = cli.trayIconCount;

-	if ( !cli.events.count || !nTrayCnt)  return; 

-	if (cli.events.count == 1 || nTrayCnt == 1) 

+	if ( !cli.events.count || !nTrayCnt)  return;

+	if (cli.events.count == 1 || nTrayCnt == 1)

 	{

 		ShowOneEventInTray(0); //for only one icon in tray show topmost event

 		return;

 	}

 

-	// in case if we have several icons in tray and several events with different protocols 

+	// in case if we have several icons in tray and several events with different protocols

 	// lets use several icon to show events from protocols in different icons

 	cli.pfnLockTray();

 	pTrayProtos = (char**)_alloca(sizeof(char*)*cli.trayIconCount);

@@ -215,8 +216,8 @@ int fnRemoveEvent(HANDLE hContact, HANDLE dbEvent)
 

 	// Update contact's icon

 	szProto = GetContactProto(hContact);

-	cli.pfnChangeContactIcon(cli.events.items[i]->cle.hContact, 

-		CallService(MS_CLIST_GETCONTACTICON, (WPARAM)cli.events.items[i]->cle.hContact, 1), 

+	cli.pfnChangeContactIcon(cli.events.items[i]->cle.hContact,

+		CallService(MS_CLIST_GETCONTACTICON, (WPARAM)cli.events.items[i]->cle.hContact, 1),

 		0);

 

 	// Free any memory allocated to the event

@@ -229,9 +230,9 @@ int fnRemoveEvent(HANDLE hContact, HANDLE dbEvent)
 		{

 			if (cli.events.items[i]->cle.hContact)

 				szEventProto = GetContactProto((cli.events.items[i]->cle.hContact));

-			else if (cli.events.items[i]->cle.flags&CLEF_PROTOCOLGLOBAL) 

+			else if (cli.events.items[i]->cle.flags&CLEF_PROTOCOLGLOBAL)

 				szEventProto = (char *) cli.events.items[i]->cle.lpszProtocol;

-			else 

+			else

 				szEventProto = NULL;

 			if (szEventProto && szProto && !lstrcmpA(szEventProto, szProto))

 				nSameProto++;

@@ -303,7 +304,7 @@ int fnEventsProcessTrayDoubleClick(int index)
 			if (szProto) {

 				for (i=0; i<cli.events.count; i++) {

 					char * eventProto = NULL;

-					if (cli.events.items[i]->cle.hContact) 

+					if (cli.events.items[i]->cle.hContact)

 						eventProto = GetContactProto(cli.events.items[i]->cle.hContact);

 					if ( !eventProto)

 						eventProto = cli.events.items[i]->cle.lpszProtocol;

@@ -320,7 +321,7 @@ int fnEventsProcessTrayDoubleClick(int index)
 					if (click_in_first_icon)

 						for (i=0; i<cli.events.count; i++) {

 							char * eventProto = NULL;

-							if (cli.events.items[i]->cle.hContact) 

+							if (cli.events.items[i]->cle.hContact)

 								eventProto = GetContactProto(cli.events.items[i]->cle.hContact);

 							if ( !eventProto)

 								eventProto = cli.events.items[i]->cle.lpszProtocol;

@@ -335,7 +336,7 @@ int fnEventsProcessTrayDoubleClick(int index)
 								}

 							}

 						}

-					if (i == cli.events.count) { //not found 

+					if (i == cli.events.count) { //not found

 						cli.pfnUnlockTray();

 						return 1;	//continue processing to show contact list

 					}

diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index 013d13ee96..7e3521eee9 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project,

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #pragma hdrstop

 

@@ -1095,7 +1096,7 @@ static int MenuProtoAck(WPARAM, LPARAM lParam)
 	}

 	else {

 		int pos = statustopos(cli.currentStatusMenuItem);

-		if (pos == -1) 

+		if (pos == -1)

 			pos = 0;

 

 		if (pos >= 0 && pos < hStatusMainMenuHandlesCnt) {

diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 3c7f6ddc49..79fb3a7fe8 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -140,7 +141,7 @@ static int ProtocolAck(WPARAM, LPARAM lParam)
 	ACKDATA *ack = (ACKDATA *) lParam;

 	if (ack->type != ACKTYPE_STATUS)

 		return 0;

-	

+

 	CallService(MS_CLUI_PROTOCOLSTATUSCHANGED, ack->lParam, (LPARAM) ack->szModule);

 

 	if ((int)ack->hProcess < ID_STATUS_ONLINE && ack->lParam >= ID_STATUS_ONLINE) {

@@ -190,7 +191,7 @@ static INT_PTR GetContactIcon(WPARAM wParam, LPARAM)
 	char *szProto = GetContactProto((HANDLE)wParam);

 	HANDLE hContact = (HANDLE)wParam;

 

-	return cli.pfnIconFromStatusMode(szProto, 

+	return cli.pfnIconFromStatusMode(szProto,

 		szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact);

 }

 

@@ -208,7 +209,7 @@ static void AddProtoIconIndex(PROTOACCOUNT* pa)
 

 static void RemoveProtoIconIndex(PROTOACCOUNT* pa)

 {

-	for (int i=0; i < protoIconIndex.getCount(); i++) 

+	for (int i=0; i < protoIconIndex.getCount(); i++)

 		if (strcmp(protoIconIndex[i].szProto, pa->szModuleName) == 0) {

 			protoIconIndex.remove(i);

 			break;

@@ -237,7 +238,7 @@ static int ContactListModulesLoaded(WPARAM, LPARAM)
 

 static int ContactListAccountsChanged(WPARAM eventCode, LPARAM lParam)

 {

-	switch (eventCode) { 

+	switch (eventCode) {

 	case PRAC_ADDED:

 		AddProtoIconIndex((PROTOACCOUNT*)lParam);

 		break;

@@ -364,7 +365,7 @@ int fnGetWindowVisibleState(HWND hWnd, int iStepX, int iStepY)
 

 	if (iNotCoveredDots == 0)  //They're all covered!

 		return GWVS_COVERED;

-		

+

 	//There are dots which are visible, but they are not as many as the ones we counted: it's partially covered.

 	return GWVS_PARTIALLY_COVERED;

 }

@@ -407,12 +408,12 @@ int fnShowHide(WPARAM, LPARAM)
 		//this forces the window onto the visible screen

 		GetWindowRect(cli.hwndContactList, &rcWindow);

 		if (Utils_AssertInsideScreen(&rcWindow) == 1) {

-			MoveWindow(cli.hwndContactList, rcWindow.left, rcWindow.top, 

+			MoveWindow(cli.hwndContactList, rcWindow.left, rcWindow.top,

 				rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, TRUE);

 		}

 	}

 	else {                      //It needs to be hidden

-		if (db_get_b(NULL, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) || 

+		if (db_get_b(NULL, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) ||

 			db_get_b(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT)) {

 			ShowWindow(cli.hwndContactList, SW_HIDE);

 			db_set_b(NULL, "CList", "State", SETTING_STATE_HIDDEN);

diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp
index b3d1edb897..8a2188ce69 100644
--- a/src/modules/clist/clistsettings.cpp
+++ b/src/modules/clist/clistsettings.cpp
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -45,7 +46,7 @@ void FreeDisplayNameCache(void)
 			mir_free(clistCache->items[i]);

 		}

 

-		List_Destroy(clistCache); 

+		List_Destroy(clistCache);

 		mir_free(clistCache);

 		clistCache = NULL;

 	}

@@ -89,7 +90,7 @@ ClcCacheEntry* fnGetCacheEntry(HANDLE hContact)
 {

 	ClcCacheEntry *p;

 	int idx;

-	if ( !List_GetIndex(clistCache, &hContact, &idx)) {	

+	if ( !List_GetIndex(clistCache, &hContact, &idx)) {

 		if ((p = cli.pfnCreateCacheItem(hContact)) != NULL) {

 			List_Insert(clistCache, p, idx);

 			cli.pfnInvalidateDisplayNameCacheEntry(p);

@@ -195,7 +196,7 @@ INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam)
 			_ltoa(ci.dVal, retVal, 10);

 			if (cacheEntry == NULL)

 				return (INT_PTR)mir_strdup(retVal);

-				

+

 			cacheEntry->tszName = mir_a2u(retVal);

 			return (INT_PTR)retVal;

 		}

@@ -286,9 +287,9 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 				szProto = NULL;

 			else

 				szProto = cws->value.pszVal;

-			cli.pfnChangeContactIcon(hContact, 

-				cli.pfnIconFromStatusMode(szProto, 

-					szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", 

+			cli.pfnChangeContactIcon(hContact,

+				cli.pfnIconFromStatusMode(szProto,

+					szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status",

 					ID_STATUS_OFFLINE), hContact), 0);

 		}

 	}

diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp
index 8ce5b8b861..071e667e2e 100644
--- a/src/modules/clist/clisttray.cpp
+++ b/src/modules/clist/clisttray.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -288,9 +289,9 @@ int fnTrayIconInit(HWND hwnd)
 					PROTOACCOUNT* pa = accounts[j];

 					if (cli.pfnGetProtocolVisibility(pa->szModuleName))

 						cli.pfnTrayIconAdd(hwnd, pa->szModuleName, NULL, CallProtoServiceInt(NULL,pa->szModuleName, PS_GETSTATUS, 0, 0));

-				}	

+				}

 			}

-		}	

+		}

 		else {

 			cli.pfnTrayIconAdd(hwnd, NULL, NULL, averageMode);

 

@@ -303,7 +304,7 @@ int fnTrayIconInit(HWND hwnd)
 		cli.pfnTrayIconAdd(hwnd, NULL, NULL, CallService(MS_CLIST_GETSTATUSMODE, 0, 0));

 	}

 

-	ulock; 

+	ulock;

 	return 0;

 }

 

@@ -330,7 +331,7 @@ int fnTrayIconDestroy(HWND hwnd)
 	cli.trayIcon = NULL;

 	cli.trayIconCount = 0;

 

-	ulock; 

+	ulock;

 	return 0;

 }

 

@@ -346,7 +347,7 @@ static VOID CALLBACK RefreshTimerProc(HWND, UINT, UINT_PTR, DWORD)
 {

 	int i;

 	if (RefreshTimerId) {

-		KillTimer(NULL, RefreshTimerId); 

+		KillTimer(NULL, RefreshTimerId);

 		RefreshTimerId = 0;

 	}

 	for (i=0; i < accounts.getCount(); i++) {

@@ -483,7 +484,7 @@ VOID CALLBACK fnTrayCycleTimerProc(HWND, UINT, UINT_PTR, DWORD)
 

 	if (i) {

 		DestroyIcon(cli.trayIcon[0].hBaseIcon);

-		cli.trayIcon[0].hBaseIcon = cli.pfnGetIconFromStatusMode(NULL, accounts[cycleStep]->szModuleName, 

+		cli.trayIcon[0].hBaseIcon = cli.pfnGetIconFromStatusMode(NULL, accounts[cycleStep]->szModuleName,

 			CallProtoServiceInt(NULL,accounts[cycleStep]->szModuleName, PS_GETSTATUS, 0, 0));

 		if (cli.trayIcon[0].isBase)

 			cli.pfnTrayIconUpdate(cli.trayIcon[0].hBaseIcon, NULL, NULL, 1);

@@ -539,8 +540,8 @@ void fnTrayIconUpdateBase(const char *szChangedProto)
 						szProto = NULL;

 					else

 						szProto = dbv.pszVal;

-					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szProto, szProto ? 

-						CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0) : 

+					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szProto, szProto ?

+						CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0) :

 						CallService(MS_CLIST_GETSTATUSMODE, 0, 0)), szProto);

 					db_free(&dbv);

 				}

@@ -548,9 +549,9 @@ void fnTrayIconUpdateBase(const char *szChangedProto)
 

 			case SETTING_TRAYICON_CYCLE:

 				cli.cycleTimerId = SetTimer(NULL, 0, db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT) * 1000, cli.pfnTrayCycleTimerProc);

-				changed = 

+				changed =

 					cli.pfnTrayIconSetBaseInfo(ImageList_GetIcon

-					(hCListImages, cli.pfnIconFromStatusMode(szChangedProto, CallProtoServiceInt(NULL,szChangedProto, PS_GETSTATUS, 0, 0), NULL), 

+					(hCListImages, cli.pfnIconFromStatusMode(szChangedProto, CallProtoServiceInt(NULL,szChangedProto, PS_GETSTATUS, 0, 0), NULL),

 					ILD_NORMAL), NULL);

 				break;

 

@@ -741,7 +742,7 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
 						for (int j = 0; j < accounts.getCount(); j++)

 						{

 							int k = cli.pfnGetAccountIndexByPos(j);

-							if (k >= 0) 

+							if (k >= 0)

 							{

 								if ( !strcmp(cli.trayIcon[i].szProto, accounts[k]->szModuleName))

 								{

@@ -752,7 +753,7 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
 

 								if (cli.pfnGetProtocolVisibility(accounts[k]->szModuleName))

 									++ind;

-							}	

+							}

 						}

 						break;

 					}

@@ -821,7 +822,7 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam)
 			*((LRESULT *) lParam) = 0;

 			return TRUE;

 		}

-		else if (msg->message == WM_TASKBARBUTTONCREATED) { 

+		else if (msg->message == WM_TASKBARBUTTONCREATED) {

 			SetTaskBarIcon(lastTaskBarIcon, NULL);

 			*((LRESULT *) lParam) = 0;

 			return TRUE;

diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 8fcc0a3120..307cc0b914 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -1,25 +1,26 @@
 /*

 

-  Miranda IM: the free IM client for Microsoft* Windows*

+Miranda IM: the free IM client for Microsoft* Windows*

 

-  Copyright 2000-2010 Miranda ICQ/IM project,

-  all portions of this codebase are copyrighted to the people

-  listed in contributors.txt.

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

+listed in contributors.txt.

 

-  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 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.

+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.

+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 "..\..\core\commonheaders.h"

 #include "../database/profilemanager.h"

 #include "clc.h"

@@ -627,7 +628,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	{

 		LRESULT result;

 		result = DefWindowProc(hwnd, WM_NCHITTEST, wParam, lParam);

-		if (result == HTSIZE || result == HTTOP || result == HTTOPLEFT || result == HTTOPRIGHT  || 

+		if (result == HTSIZE || result == HTTOP || result == HTTOPLEFT || result == HTTOPRIGHT  ||

 			result == HTBOTTOM || result == HTBOTTOMRIGHT || result == HTBOTTOMLEFT)

 			if (db_get_b(NULL, "CLUI", "AutoSize", 0))

 				return HTCLIENT;

@@ -718,7 +719,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 

 		case SC_MINIMIZE:

 		case SC_CLOSE:

-			if ((GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) || 

+			if ((GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) ||

 				db_get_b(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT))

 			{

 				ShowWindow(hwnd, SW_HIDE);

diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp
index 6fe9fb8b6f..ef9885de72 100644
--- a/src/modules/clist/cluiservices.cpp
+++ b/src/modules/clist/cluiservices.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp
index 9ecc273604..01e60c94fc 100644
--- a/src/modules/clist/contact.cpp
+++ b/src/modules/clist/contact.cpp
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -32,15 +33,15 @@ int sortByProto;
 static const struct {

 	int status, order;

 } statusModeOrder[] = {

-	{ID_STATUS_OFFLINE, 500}, 

-	{ID_STATUS_ONLINE, 10}, 

-	{ID_STATUS_AWAY, 200}, 

-	{ID_STATUS_DND, 110}, 

-	{ID_STATUS_NA, 450}, 

-	{ID_STATUS_OCCUPIED, 100}, 

-	{ID_STATUS_FREECHAT, 0}, 

-	{ID_STATUS_INVISIBLE, 20}, 

-	{ID_STATUS_ONTHEPHONE, 150}, 

+	{ID_STATUS_OFFLINE, 500},

+	{ID_STATUS_ONLINE, 10},

+	{ID_STATUS_AWAY, 200},

+	{ID_STATUS_DND, 110},

+	{ID_STATUS_NA, 450},

+	{ID_STATUS_OCCUPIED, 100},

+	{ID_STATUS_FREECHAT, 0},

+	{ID_STATUS_INVISIBLE, 20},

+	{ID_STATUS_ONTHEPHONE, 150},

 	{ID_STATUS_OUTTOLUNCH, 425}};

 

 static int GetContactStatus(HANDLE hContact)

@@ -167,7 +168,7 @@ INT_PTR ContactChangeGroup(WPARAM wParam, LPARAM lParam)
 		grpChg.pszNewName = cli.pfnGetGroupName(lParam, NULL);

 		db_set_ts((HANDLE)wParam, "CList", "Group", grpChg.pszNewName);

 	}

-	CallService(MS_CLUI_CONTACTADDED, wParam, 

+	CallService(MS_CLUI_CONTACTADDED, wParam,

 		cli.pfnIconFromStatusMode(GetContactProto((HANDLE)wParam), GetContactStatus((HANDLE)wParam), (HANDLE)wParam));

 

 	NotifyEventHooks(hGroupChangeEvent, wParam, (LPARAM)&grpChg);

diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp
index 3382681afc..bcc2b6091a 100644
--- a/src/modules/clist/contacts.cpp
+++ b/src/modules/clist/contacts.cpp
@@ -1,12 +1,17 @@
 /*

-Miranda IM

+

+Miranda IM: the free IM client for Microsoft* Windows*

+

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

+all portions of this codebase are copyrighted to the people

+listed in contributors.txt.

 

 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, 

+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.

@@ -19,15 +24,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "..\..\core\commonheaders.h"

 

 #define NAMEORDERCOUNT 8

-static TCHAR* nameOrderDescr[ NAMEORDERCOUNT ] = 

+static TCHAR* nameOrderDescr[ NAMEORDERCOUNT ] =

 {

-	LPGENT("My custom name (not moveable)"), 

-	LPGENT("Nick"), 

-	LPGENT("FirstName"), 

-	LPGENT("E-mail"), 

-	LPGENT("LastName"), 

-	LPGENT("Username"), 

-	LPGENT("FirstName LastName"), 

+	LPGENT("My custom name (not moveable)"),

+	LPGENT("Nick"),

+	LPGENT("FirstName"),

+	LPGENT("E-mail"),

+	LPGENT("LastName"),

+	LPGENT("Username"),

+	LPGENT("FirstName LastName"),

 	LPGENT("'(Unknown Contact)' (not moveable)")

 };

 

diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index 8f6944f837..3211ce5581 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "genmenu.h"

 

@@ -349,7 +350,7 @@ int MO_ModifyMenuItem(PMO_IntMenuItem menuHandle, PMO_MenuItem pmi)
 }

 

 //wparam MenuItemHandle

-//return ownerdata useful to free ownerdata before delete menu item, 

+//return ownerdata useful to free ownerdata before delete menu item,

 //NULL on error.

 INT_PTR MO_MenuItemGetOwnerData(WPARAM wParam, LPARAM)

 {

@@ -510,7 +511,7 @@ INT_PTR MO_CreateNewMenuObject(WPARAM, LPARAM lParam)
 	p->Name = mir_strdup(pmp->name);

 	p->CheckService = mir_strdup(pmp->CheckService);

 	p->ExecService = mir_strdup(pmp->ExecService);

-	p->m_hMenuIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 

+	p->m_hMenuIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),

 		(IsWinVerXPPlus() ? ILC_COLOR32 : ILC_COLOR16) | ILC_MASK, 15, 100);

 	g_menus.insert(p);

 	return p->id;

@@ -1054,7 +1055,7 @@ int OnIconLibChanges(WPARAM, LPARAM)
 

 static int MO_RegisterIcon(PMO_IntMenuItem pmi, void*)

 {

-	TCHAR *uname = (pmi->UniqName) ? mir_a2t(pmi->UniqName) : mir_tstrdup(pmi->CustomName), 

+	TCHAR *uname = (pmi->UniqName) ? mir_a2t(pmi->UniqName) : mir_tstrdup(pmi->CustomName),

 		*descr = GetMenuItemText(pmi);

 

 	if ( !uname && !descr)

diff --git a/src/modules/clist/genmenu.h b/src/modules/clist/genmenu.h
index 06bb467d40..c3d14b0bbd 100644
--- a/src/modules/clist/genmenu.h
+++ b/src/modules/clist/genmenu.h
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project,

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -20,6 +20,7 @@ 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.

 */

+

 #ifndef GENMENU_H

 #define GENMENU_H

 //general menu object module

diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp
index 515f5f9702..6dd96a921b 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/modules/clist/genmenuopt.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "genmenu.h"

 

@@ -442,7 +443,7 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		SetWindowLongPtr( GetDlgItem(hwndDlg, IDC_MENUITEMS), GWLP_WNDPROC, (LONG_PTR)&LBTNDOWNProc);

 		{

 			HIMAGELIST himlCheckBoxes;

-			himlCheckBoxes = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 

+			himlCheckBoxes = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),

 				(IsWinVerXPPlus() ? ILC_COLOR32 : ILC_COLOR16) | ILC_MASK, 2, 2);

 

 			ImageList_AddIcon_IconLibLoaded(himlCheckBoxes, SKINICON_OTHER_NOTICK);

diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp
index e3a6424c48..7a289603c2 100644
--- a/src/modules/clist/groups.cpp
+++ b/src/modules/clist/groups.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 

@@ -183,14 +184,14 @@ static INT_PTR DeleteGroup(WPARAM wParam, LPARAM)
 

 	CLISTGROUPCHANGE grpChg = { sizeof(CLISTGROUPCHANGE), NULL, NULL };

 

-	for (hContact = db_find_first(); 

-		hContact; 

+	for (hContact = db_find_first();

+		hContact;

 		hContact = db_find_next(hContact))

 	{

 		if (DBGetContactSettingTString(hContact, "CList", "Group", &dbv))

 			continue;

 

-		if (_tcscmp(dbv.ptszVal, name)) 

+		if (_tcscmp(dbv.ptszVal, name))

 		{

 			db_free(&dbv);

 			continue;

@@ -208,7 +209,7 @@ static INT_PTR DeleteGroup(WPARAM wParam, LPARAM)
 			grpChg.pszNewName = NULL;

 		}

 		NotifyEventHooks(hGroupChangeEvent, (WPARAM)hContact, (LPARAM)&grpChg);

-	} 

+	}

 	//shuffle list of groups up to fill gap

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

 		_itoa(i + 1, str, 10);

@@ -540,7 +541,7 @@ static INT_PTR BuildGroupMenu(WPARAM, LPARAM)
 

 int InitGroupServices(void)

 {

-	for (int i=0;; i++) 

+	for (int i=0;; i++)

 	{

 		char str[32];

 		_itoa(i, str, 10);

diff --git a/src/modules/clist/keyboard.cpp b/src/modules/clist/keyboard.cpp
index 01cea3c4ff..2ac34532c1 100644
--- a/src/modules/clist/keyboard.cpp
+++ b/src/modules/clist/keyboard.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 #include "clc.h"

 #include <m_hotkeys.h>

diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp
index 0e5bfd5420..1c95688b0a 100644
--- a/src/modules/clist/movetogroup.cpp
+++ b/src/modules/clist/movetogroup.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h"

 

 HANDLE hOnCntMenuBuild;

@@ -84,7 +85,7 @@ static void AddGroupItem(HGENMENU hRoot, TCHAR* name, int pos, WPARAM param, boo
 static int OnContactMenuBuild(WPARAM wParam, LPARAM)

 {

 	int i;

-	OBJLIST<GroupItemSort> groups(10, GroupItemSort::compare);	

+	OBJLIST<GroupItemSort> groups(10, GroupItemSort::compare);

 

 	if ( !hMoveToGroupItem) {

 		CLISTMENUITEM mi = { sizeof(mi) };

@@ -108,7 +109,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM)
 

 	pos += 100000; // Separator

 

-	for (i=0; ; i++) 

+	for (i=0; ; i++)

 	{

 		char intname[20];

 		_itoa(i, intname, 10);

@@ -125,7 +126,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM)
 

 	for (i=0; i < groups.getCount(); i++)

 	{

-		bool checked = szContactGroup && !_tcscmp(szContactGroup, groups[i].name);		

+		bool checked = szContactGroup && !_tcscmp(szContactGroup, groups[i].name);

 		AddGroupItem(hMoveToGroupItem, groups[i].name, ++pos, groups[i].position, checked);

 	}

 

diff --git a/src/modules/clist/protocolorder.cpp b/src/modules/clist/protocolorder.cpp
index b74ef1105d..23b88d57e8 100644
--- a/src/modules/clist/protocolorder.cpp
+++ b/src/modules/clist/protocolorder.cpp
@@ -2,7 +2,7 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2010 Miranda ICQ/IM project, 

+Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,

 all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

@@ -11,7 +11,7 @@ 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, 

+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.

@@ -21,10 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-// options dialog for protocol order and visibility

-// written by daniel vijge

-// gpl license ect...

-

 #include "..\..\core\commonheaders.h"

 #include "clc.h"