- standardized version resource;

- unused header file removed from project;
- code cleaning;
- version bump


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

1 files changed, 833 insertions, 1127 deletions

diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index 9b918be898..f934d45022 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -55,53 +55,44 @@ static int g_MsgSplitterX, g_ContactSplitterX;
 static int MinMsgSplitterX, MinContactSplitterX;

 static int MinMsgEditSize; // used to calculate minimal X size of the dialog

 

-

-

 static LRESULT CALLBACK MsgEditSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)

 {

-	switch (Msg)

-	{

-		case WM_CHAR:

-		{

-			if (GetKeyState(VK_CONTROL) & 0x8000)

-			{

-				if (wParam == '\n')

-				{ // ctrl-enter

-					PostMessage(GetParent(hWnd), WM_COMMAND, IDC_OK, 0);

-					return 0;

-				}

-				if (wParam == 1)

-				{ // ctrl-a

-					SendMessage(hWnd, EM_SETSEL, 0, -1);

-					return 0;

-				}

-				if (wParam == 23)

-				{ // ctrl-w

-					SendMessage(GetParent(hWnd), WM_CLOSE, 0, 0);

-					return 0;

-				}

-				if (wParam == 127)

-				{ // ctrl-backspace

-					DWORD start, end;

-					SendMessage(hWnd, EM_GETSEL, (WPARAM)&end, NULL);

-					SendMessage(hWnd, WM_KEYDOWN, VK_LEFT, 0);

-					SendMessage(hWnd, EM_GETSEL, (WPARAM)&start, NULL);

-					int nLen = GetWindowTextLength(hWnd);

-					TCHAR *text = (TCHAR*)malloc((nLen + 1) * sizeof(TCHAR));

-					GetWindowText(hWnd, text, nLen + 1);

-					MoveMemory(text + start, text + end, sizeof(TCHAR) * (_tcslen(text) + 1 - end));

-					SetWindowText(hWnd, text);

-					free(text);

-					SendMessage(hWnd, EM_SETSEL, start, start);

-					SendMessage(GetParent(hWnd), WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(hWnd), EN_CHANGE), (LPARAM)hWnd);

-					return 0;

-				}

+	switch (Msg) {

+	case WM_CHAR:

+		if (GetKeyState(VK_CONTROL) & 0x8000) {

+			if (wParam == '\n') { // ctrl-enter

+				PostMessage(GetParent(hWnd), WM_COMMAND, IDC_OK, 0);

+				return 0;

 			}

-		} break;

-		case WM_KEYDOWN:

-		{

-			SendMessage(GetParent(hWnd), UM_SAM_KILLTIMER, 0, 0);

-		} break;

+			if (wParam == 1) { // ctrl-a

+				SendMessage(hWnd, EM_SETSEL, 0, -1);

+				return 0;

+			}

+			if (wParam == 23) { // ctrl-w

+				SendMessage(GetParent(hWnd), WM_CLOSE, 0, 0);

+				return 0;

+			}

+			if (wParam == 127) { // ctrl-backspace

+				DWORD start, end;

+				SendMessage(hWnd, EM_GETSEL, (WPARAM)&end, NULL);

+				SendMessage(hWnd, WM_KEYDOWN, VK_LEFT, 0);

+				SendMessage(hWnd, EM_GETSEL, (WPARAM)&start, NULL);

+				int nLen = GetWindowTextLength(hWnd);

+				TCHAR *text = (TCHAR*)malloc((nLen + 1) * sizeof(TCHAR));

+				GetWindowText(hWnd, text, nLen + 1);

+				MoveMemory(text + start, text + end, sizeof(TCHAR)* (_tcslen(text) + 1 - end));

+				SetWindowText(hWnd, text);

+				free(text);

+				SendMessage(hWnd, EM_SETSEL, start, start);

+				SendMessage(GetParent(hWnd), WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(hWnd), EN_CHANGE), (LPARAM)hWnd);

+				return 0;

+			}

+		}

+		break;

+	

+	case WM_KEYDOWN:

+		SendMessage(GetParent(hWnd), UM_SAM_KILLTIMER, 0, 0);

+		break;

 	}

 	return CallWindowProc(g_OrigEditMsgProc, hWnd, Msg, wParam, lParam);

 }

@@ -109,37 +100,29 @@ static LRESULT CALLBACK MsgEditSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam,
 // used splitter code from TabSRMM as a base

 static LRESULT CALLBACK SplitterSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)

 {

-	switch (Msg)

-	{

-		case WM_NCHITTEST:

-		{

-			return HTCLIENT;

-		}

-		case WM_SETCURSOR:

-		{

-			SetCursor(LoadCursor(NULL, IDC_SIZEWE));

-			return true;

-		}

-		case WM_LBUTTONDOWN:

-		{

-			SetCapture(hWnd);

-			return false;

-		}

-		case WM_MOUSEMOVE:

-		{

-			if (GetCapture() == hWnd)

-			{

-				RECT rc;

-				GetClientRect(hWnd, &rc);

-				SendMessage(GetParent(hWnd), UM_SAM_SPLITTERMOVED, (short)LOWORD(GetMessagePos()) + rc.right / 2, (LPARAM)GetDlgCtrlID(hWnd));

-			}

-			return 0;

-		}

-		case WM_LBUTTONUP:

-		{

-			ReleaseCapture();

-			return false;

+	switch (Msg) {

+	case WM_NCHITTEST:

+		return HTCLIENT;

+

+	case WM_SETCURSOR:

+		SetCursor(LoadCursor(NULL, IDC_SIZEWE));

+		return true;

+

+	case WM_LBUTTONDOWN:

+		SetCapture(hWnd);

+		return false;

+

+	case WM_MOUSEMOVE:

+		if (GetCapture() == hWnd) {

+			RECT rc;

+			GetClientRect(hWnd, &rc);

+			SendMessage(GetParent(hWnd), UM_SAM_SPLITTERMOVED, (short)LOWORD(GetMessagePos()) + rc.right / 2, (LPARAM)GetDlgCtrlID(hWnd));

 		}

+		return 0;

+

+	case WM_LBUTTONUP:

+		ReleaseCapture();

+		return false;

 	}

 	return CallWindowProc(g_OrigSplitterProc, hWnd, Msg, wParam, lParam);

 }

@@ -147,125 +130,102 @@ static LRESULT CALLBACK SplitterSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam,
 static LRESULT CALLBACK CListSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)

 {

 	CCList *dat = CWndUserData(GetParent(hWnd)).GetCList();

-	switch (Msg)

-	{

-		case WM_MOUSEMOVE:

+	switch (Msg) {

+	case WM_MOUSEMOVE:

 		{

 			DWORD hitFlags;

-			POINT pt = {(short)LOWORD(lParam), (short)HIWORD(lParam)};

+			POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) };

 			if (dat->HitTest(&pt, &hitFlags) && hitFlags & MCLCHT_ONITEMEXTRA)

-			{

 				lParam = 0; // reset mouse coordinates, so TreeView's wndproc will not draw any item in a hovered state

-			}

-		} break;

-		case WM_LBUTTONDOWN:

-		case WM_LBUTTONDBLCLK:

-		{

-			DWORD hitFlags;

-			POINT pt = {(short)LOWORD(lParam), (short)HIWORD(lParam)};

-			if (dat->HitTest(&pt, &hitFlags) && hitFlags & MCLCHT_ONITEMEXTRA)

-			{

-				SetFocus(hWnd);

-				NMHDR nmhdr;

-				nmhdr.code = NM_CLICK;

-				nmhdr.hwndFrom = hWnd;

-				nmhdr.idFrom = GetDlgCtrlID(hWnd);

-				SendMessage(GetParent(hWnd), WM_NOTIFY, 0, (LPARAM)&nmhdr);

-				return DefWindowProc(hWnd, Msg, wParam, lParam);

-			}

-		} break;

+		}

+		break;

+	case WM_LBUTTONDOWN:

+	case WM_LBUTTONDBLCLK:

+		DWORD hitFlags;

+		POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) };

+		if (dat->HitTest(&pt, &hitFlags) && hitFlags & MCLCHT_ONITEMEXTRA) {

+			SetFocus(hWnd);

+			NMHDR nmhdr;

+			nmhdr.code = NM_CLICK;

+			nmhdr.hwndFrom = hWnd;

+			nmhdr.idFrom = GetDlgCtrlID(hWnd);

+			SendMessage(GetParent(hWnd), WM_NOTIFY, 0, (LPARAM)&nmhdr);

+			return DefWindowProc(hWnd, Msg, wParam, lParam);

+		}

 	}

 	return CallWindowProc(g_OrigCListProc, hWnd, Msg, wParam, lParam);

 }

 

-

 static int SetAwayMsgDlgResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc)

 {

 	COptPage *SetAwayMsgPage = (COptPage*)lParam;

-	int bShowMsgTree = SetAwayMsgPage->GetValue(IDS_SAWAYMSG_SHOWMSGTREE);

+	int bShowMsgTree = SetAwayMsgPage->GetValue(IDS_SAWAYMSG_SHOWMSGTREE), X;

 	int bShowContactTree = SetAwayMsgPage->GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE);

-	switch (urc->wId)

-	{

-		case IDC_SAWAYMSG_MSGDATA:

-		{

-			urc->rcItem.right = urc->dlgOriginalSize.cx - 2;

-			if (bShowContactTree)

-			{

-				urc->rcItem.right -= g_ContactSplitterX;

-			}

-			urc->rcItem.left = (bShowMsgTree) ? (g_MsgSplitterX + 2) : 2;

-			return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT;

-		}

-		case IDC_SAWAYMSG_TREE:

-		{

-			urc->rcItem.right = g_MsgSplitterX - 2;

-			return RD_ANCHORX_LEFT | RD_ANCHORY_HEIGHT;

-		}

-		case IDC_SAWAYMSG_CONTACTSTREE:

-		{

-			urc->rcItem.left = urc->dlgOriginalSize.cx - g_ContactSplitterX + 2;

-			return RD_ANCHORX_RIGHT | RD_ANCHORY_HEIGHT;

-		}

-		case IDC_OK:

-		{

-			int X = bShowMsgTree ? min(max(g_MsgSplitterX, MinMsgSplitterX), urc->dlgNewSize.cx - ((bShowContactTree ? MinContactSplitterX : 0) + MinMsgEditSize)) : 0;

-			OffsetRect(&urc->rcItem, X + 2 - urc->rcItem.left, 0);

-			return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;

-		}

-		case IDC_SAWAYMSG_EDITMSGS:

-		case IDC_SAWAYMSG_SAVEMSG:

-		case IDC_SAWAYMSG_SAVEASNEW:

-		case IDC_SAWAYMSG_NEWCATEGORY:

-		case IDC_SAWAYMSG_DELETE:

-		{

-			return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;

-		}

-		case IDC_SAWAYMSG_VARS:

-		case IDC_SAWAYMSG_OPTIONS:

-		{

-			int X = bShowContactTree ? max(min(g_ContactSplitterX, urc->dlgNewSize.cx - (bShowMsgTree ? max(g_MsgSplitterX, MinMsgSplitterX) : 0) - MinMsgEditSize), MinContactSplitterX) : 0;

-			OffsetRect(&urc->rcItem, urc->dlgOriginalSize.cx - X - 2 - urc->rcItem.right - ((urc->wId == IDC_SAWAYMSG_VARS) ? g_VariablesButtonDX : 0), 0);

-			return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM;

-		}

-		case IDC_SAWAYMSG_STATIC_IGNOREICON:

-		case IDC_SAWAYMSG_STATIC_REPLYICON:

-		{

-			urc->rcItem.left = urc->rcItem.right - 16;

-			urc->rcItem.top = urc->rcItem.bottom - 16;

-		} // go through

-		case IDC_SAWAYMSG_IGNOREREQ:

-		case IDC_SAWAYMSG_SENDMSG:

-		{

-			return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM;

-		}

-		case IDC_SAWAYMSG_MSGSPLITTER:

-		{

-			OffsetRect(&urc->rcItem, g_MsgSplitterX - (urc->rcItem.left + ++urc->rcItem.right) / 2, 0);

-			return RD_ANCHORX_LEFT | RD_ANCHORY_HEIGHT;

-		}

-		case IDC_SAWAYMSG_CONTACTSPLITTER:

-		{

-			OffsetRect(&urc->rcItem, urc->dlgOriginalSize.cx - g_ContactSplitterX - (urc->rcItem.left + urc->rcItem.right) / 2, 0);

-			return RD_ANCHORX_RIGHT | RD_ANCHORY_HEIGHT;

-		}

+	switch (urc->wId) {

+	case IDC_SAWAYMSG_MSGDATA:

+		urc->rcItem.right = urc->dlgOriginalSize.cx - 2;

+		if (bShowContactTree)

+			urc->rcItem.right -= g_ContactSplitterX;

+		urc->rcItem.left = (bShowMsgTree) ? (g_MsgSplitterX + 2) : 2;

+		return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT;

+

+	case IDC_SAWAYMSG_TREE:

+		urc->rcItem.right = g_MsgSplitterX - 2;

+		return RD_ANCHORX_LEFT | RD_ANCHORY_HEIGHT;

+

+	case IDC_SAWAYMSG_CONTACTSTREE:

+		urc->rcItem.left = urc->dlgOriginalSize.cx - g_ContactSplitterX + 2;

+		return RD_ANCHORX_RIGHT | RD_ANCHORY_HEIGHT;

+

+	case IDC_OK:

+		X = bShowMsgTree ? min(max(g_MsgSplitterX, MinMsgSplitterX), urc->dlgNewSize.cx - ((bShowContactTree ? MinContactSplitterX : 0) + MinMsgEditSize)) : 0;

+		OffsetRect(&urc->rcItem, X + 2 - urc->rcItem.left, 0);

+		return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;

+

+	case IDC_SAWAYMSG_EDITMSGS:

+	case IDC_SAWAYMSG_SAVEMSG:

+	case IDC_SAWAYMSG_SAVEASNEW:

+	case IDC_SAWAYMSG_NEWCATEGORY:

+	case IDC_SAWAYMSG_DELETE:

+		return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;

+

+	case IDC_SAWAYMSG_VARS:

+	case IDC_SAWAYMSG_OPTIONS:

+		X = bShowContactTree ? max(min(g_ContactSplitterX, urc->dlgNewSize.cx - (bShowMsgTree ? max(g_MsgSplitterX, MinMsgSplitterX) : 0) - MinMsgEditSize), MinContactSplitterX) : 0;

+		OffsetRect(&urc->rcItem, urc->dlgOriginalSize.cx - X - 2 - urc->rcItem.right - ((urc->wId == IDC_SAWAYMSG_VARS) ? g_VariablesButtonDX : 0), 0);

+		return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM;

+

+	case IDC_SAWAYMSG_STATIC_IGNOREICON:

+	case IDC_SAWAYMSG_STATIC_REPLYICON:

+		urc->rcItem.left = urc->rcItem.right - 16;

+		urc->rcItem.top = urc->rcItem.bottom - 16;

+		return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM;

+

+	case IDC_SAWAYMSG_IGNOREREQ:

+	case IDC_SAWAYMSG_SENDMSG:

+		return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM;

+

+	case IDC_SAWAYMSG_MSGSPLITTER:

+		OffsetRect(&urc->rcItem, g_MsgSplitterX - (urc->rcItem.left + ++urc->rcItem.right) / 2, 0);

+		return RD_ANCHORX_LEFT | RD_ANCHORY_HEIGHT;

+

+	case IDC_SAWAYMSG_CONTACTSPLITTER:

+		OffsetRect(&urc->rcItem, urc->dlgOriginalSize.cx - g_ContactSplitterX - (urc->rcItem.left + urc->rcItem.right) / 2, 0);

+		return RD_ANCHORX_RIGHT | RD_ANCHORY_HEIGHT;

 	}

 

-

 	return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;

 }

 

-

 __inline int DBValueToReplyIcon(int Value)

 {

-	switch (Value)

-	{

+	switch (Value) {

 		case VAL_USEDEFAULT: return EXTRAIMGLIST_DOT;

 		case 0: return EXTRAIMGLIST_AUTOREPLY_OFF;

 		default: return EXTRAIMGLIST_AUTOREPLY_ON;

 	}

 }

 

-

 int GetRealReplyIcon(CCList *CList, HTREEITEM hItem)

 {

 	_ASSERT(CList);

@@ -281,86 +241,63 @@ void SetExtraIcon(CCList *CList, int nColumn, HTREEITEM hItem, int nIcon)
 	_ASSERT(CList);

 	int ItemType = CList->GetItemType(hItem);

 	MCONTACT hContact = CList->GethContact(hItem);

-	if (ItemType == MCLCIT_CONTACT)

-	{

-		if (nIcon == -1) // means we need to retrieve it from the db by ourselves

-		{

+	if (ItemType == MCLCIT_CONTACT) {

+		if (nIcon == -1) { // means we need to retrieve it from the db by ourselves

 			if (nColumn == EXTRACOLUMN_IGNORE)

-			{

 				nIcon = CContactSettings(0, hContact).Ignore ? EXTRAIMGLIST_IGNORE : EXTRAIMGLIST_DOT;

-			} else

-			{

+			else {

 				_ASSERT(nColumn == EXTRACOLUMN_REPLY);

 				nIcon = DBValueToReplyIcon(CContactSettings(0, hContact).Autoreply);

 			}

-		} else // save it back to the db

-		{

+		}

+		else { // save it back to the db

 			if (nColumn == EXTRACOLUMN_IGNORE)

-			{

 				CContactSettings(0, hContact).Ignore = nIcon == EXTRAIMGLIST_IGNORE;

-			} else

-			{

+			else {

 				_ASSERT(nColumn == EXTRACOLUMN_REPLY);

 				CContactSettings(0, hContact).Autoreply = (nIcon == EXTRAIMGLIST_DOT) ? VAL_USEDEFAULT : (nIcon == EXTRAIMGLIST_AUTOREPLY_ON);

 			}

 		}

 		if (nColumn == EXTRACOLUMN_IGNORE && nIcon != EXTRAIMGLIST_IGNORE)

-		{

 			nIcon = (CContactSettings(0, hContact).GetMsgFormat(GMF_PERSONAL) == NULL) ? EXTRAIMGLIST_DOT : EXTRAIMGLIST_MSG;

-		}

-	} else if (ItemType == MCLCIT_INFO)

-	{

+	}

+	else if (ItemType == MCLCIT_INFO) {

 		char *szProto = (char*)CList->GetItemParam(hItem);

-		if (nColumn == EXTRACOLUMN_REPLY)

-		{

+		if (nColumn == EXTRACOLUMN_REPLY) {

 			if (nIcon == -1)

-			{

 				nIcon = DBValueToReplyIcon(CProtoSettings(szProto).Autoreply);

-			} else

-			{

+			else

 				CProtoSettings(szProto).Autoreply = (nIcon == EXTRAIMGLIST_DOT) ? VAL_USEDEFAULT : (nIcon == EXTRAIMGLIST_AUTOREPLY_ON);

-			}

+

 			if (!szProto && nIcon == EXTRAIMGLIST_DOT)

-			{

 				nIcon = EXTRAIMGLIST_AUTOREPLY_OFF;

-			}

-		} else

-		{

-			nIcon = (CProtoSettings(szProto).GetMsgFormat(GMF_TEMPORARY | GMF_PERSONAL) == NULL) ? EXTRAIMGLIST_DOT : EXTRAIMGLIST_MSG;

 		}

+		else nIcon = (CProtoSettings(szProto).GetMsgFormat(GMF_TEMPORARY | GMF_PERSONAL) == NULL) ? EXTRAIMGLIST_DOT : EXTRAIMGLIST_MSG;

 	}

+	

 	int Ignore = (nColumn == EXTRACOLUMN_IGNORE) ? (nIcon == EXTRAIMGLIST_IGNORE) : ((ItemType == MCLCIT_CONTACT) ? CContactSettings(0, hContact).Ignore : ((ItemType == MCLCIT_GROUP) ? CList->GetExtraImage(hItem, EXTRACOLUMN_IGNORE) : false));

-	if (Ignore)

-	{

+	if (Ignore) {

 		if (nColumn == EXTRACOLUMN_IGNORE)

-		{

 			CList->SetExtraImage(hItem, EXTRACOLUMN_REPLY, CLC_EXTRAICON_EMPTY);

-		} else

-		{

+		else

 			nIcon = CLC_EXTRAICON_EMPTY;

-		}

-	} else

-	{

+	}

+	else {

 		int nReplyIcon;

 		if (ItemType == MCLCIT_CONTACT)

-		{

 			nReplyIcon = DBValueToReplyIcon(CContactSettings(0, hContact).Autoreply);

-		} else if (ItemType == MCLCIT_GROUP)

-		{

+		else if (ItemType == MCLCIT_GROUP)

 			nReplyIcon = GetRealReplyIcon(CList, hItem);

-		} else

-		{

+		else {

 			_ASSERT(ItemType == MCLCIT_INFO);

 			char *szProto = (char*)CList->GetItemParam(hItem);

 			nReplyIcon = DBValueToReplyIcon(CProtoSettings(szProto).Autoreply);

 		}

+		

 		if (nColumn == EXTRACOLUMN_IGNORE)

-		{

 			CList->SetExtraImage(hItem, EXTRACOLUMN_REPLY, nReplyIcon);

-		} else if (nIcon == CLC_EXTRAICON_EMPTY)

-		{

+		else if (nIcon == CLC_EXTRAICON_EMPTY)

 			nIcon = nReplyIcon;

-		}

 	}

 	CList->SetExtraImage(hItem, nColumn, nIcon);

 }

@@ -371,77 +308,61 @@ void SetCListGroupIcons(SetAwayMsgData *dat, CCList *CList)
 	_ASSERT(CList);

 	HTREEITEM hItem = CList->GetNextItem(MCLGN_LAST, NULL); // start from last item, so every item is processed before its parents

 	if (!hItem)

-	{

 		return;

-	}

-	if (CList->GetItemType(hItem) != MCLCIT_GROUP)

-	{

+

+	if (CList->GetItemType(hItem) != MCLCIT_GROUP) {

 		hItem = CList->GetNextItem(MCLGN_PREV | MCLGN_GROUP | MCLGN_MULTILEVEL, hItem);

 		if (!hItem)

-		{

 			return;

-		}

 	}

-	do

-	{

+	

+	do {

 		HTREEITEM hCurItem = CList->GetNextItem(MCLGN_CHILD, hItem);

-		if (hCurItem)

-		{

+		if (hCurItem) {

 			int IgnoreIcon = CList->GetExtraImage(hCurItem, EXTRACOLUMN_IGNORE);

 			int AutoreplyIcon = GetRealReplyIcon(CList, hCurItem);

 			if (IgnoreIcon == EXTRAIMGLIST_MSG)

-			{

 				IgnoreIcon = EXTRAIMGLIST_DOT;

-			}

-			while ((hCurItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_ANY, hCurItem)) && (IgnoreIcon != EXTRAIMGLIST_DOT || AutoreplyIcon != EXTRAIMGLIST_DOT))

-			{

+	

+			while ((hCurItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_ANY, hCurItem)) && (IgnoreIcon != EXTRAIMGLIST_DOT || AutoreplyIcon != EXTRAIMGLIST_DOT)) {

 				if (CList->GetExtraImage(hCurItem, EXTRACOLUMN_IGNORE) != EXTRAIMGLIST_IGNORE)

-				{

 					IgnoreIcon = EXTRAIMGLIST_DOT;

-				}

+

 				int CurReplyIcon = GetRealReplyIcon(CList, hCurItem);

 				if (CurReplyIcon != AutoreplyIcon)

-				{

 					AutoreplyIcon = EXTRAIMGLIST_DOT;

-				}

 			}

 			CList->SetItemParam(hItem, AutoreplyIcon); // store Reply icon in item's Param, so that we can always get real reply icon for groups later, even if CLC_EXTRAICON_EMPTY is set instead of it

 			SetExtraIcon(CList, EXTRACOLUMN_IGNORE, hItem, IgnoreIcon);

 			SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, AutoreplyIcon);

 		}

-	} while (hItem = CList->GetNextItem(MCLGN_PREV | MCLGN_GROUP | MCLGN_MULTILEVEL, hItem));

+	}

+		while (hItem = CList->GetNextItem(MCLGN_PREV | MCLGN_GROUP | MCLGN_MULTILEVEL, hItem));

 }

 

 

 int GetSelContactsNum(CCList *CList, PTREEITEMARRAY Selection = NULL, bool *bOnlyInfo = NULL) // "SelContacts" mean not only contacts, but everything with "personal" status messages and settings - i.e. "All contacts" and protocol items are counted too.

 {

 	if (!CList)

-	{

 		return (Selection == CLSEL_DAT_NOTHING) ? 0 : 1; // Selection == NULL means we need to retrieve current selection by ourselves, and current selection is always CLSEL_DAT_CONTACT in this case

-	}

+

 	if (!Selection)

-	{

 		Selection = CList->GetSelection();

-	}

-	int I;

+

 	int nContacts = 0;

 	if (bOnlyInfo)

-	{

 		*bOnlyInfo = true;

-	}

-	for (I = 0; I < Selection->GetSize(); I++)

-	{

-		int ItemType = CList->GetItemType((*Selection)[I]);

+

+	for (int i = 0; i < Selection->GetSize(); i++) {

+		int ItemType = CList->GetItemType((*Selection)[i]);

 		if (bOnlyInfo && ItemType != MCLCIT_INFO)

-		{

 			*bOnlyInfo = false;

-		}

+

 		nContacts += ItemType == MCLCIT_CONTACT || ItemType == MCLCIT_INFO;

 	}

 	return nContacts;

 }

 

-

 void ApplySelContactsMessage(SetAwayMsgData* dat, CCList *CList, PTREEITEMARRAY Selection = NULL)

 {

 	TCString Message;

@@ -449,36 +370,29 @@ void ApplySelContactsMessage(SetAwayMsgData* dat, CCList *CList, PTREEITEMARRAY
 	GetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, Message.GetBuffer(AWAY_MSGDATA_MAX), AWAY_MSGDATA_MAX);

 	Message.ReleaseBuffer();

 	if (!lstrlen(Message))

-	{

 		Message = NULL; // delete personal message if it's empty

-	}

-	if (CList)

-	{

+

+	if (CList) {

 		if (!Selection)

-		{

 			Selection = CList->GetSelection();

-		}

-		int I;

-		for (I = 0; I < Selection->GetSize(); I++)

-		{

-			HTREEITEM hItem = (*Selection)[I];

+

+		for (int i = 0; i < Selection->GetSize(); i++) {

+			HTREEITEM hItem = (*Selection)[i];

 			int ItemType = CList->GetItemType(hItem);

-			if (ItemType == MCLCIT_CONTACT)

-			{

+			if (ItemType == MCLCIT_CONTACT) {

 				MCONTACT hContact = CList->GethContact(hItem);

 				CContactSettings(0, hContact).SetMsgFormat(SMF_PERSONAL, Message);

-			} else if (ItemType == MCLCIT_INFO)

-			{

+			}

+			else if (ItemType == MCLCIT_INFO) {

 				char *szProto = (char*)CList->GetItemParam(hItem);

 				CProtoSettings(szProto).SetMsgFormat(SMF_PERSONAL, (szProto || Message != NULL) ? Message : _T("")); // "szProto || Message != NULL..." means that we'll set an empty message instead of NULL for the global status, if the message is empty (NULL for the global status has a special meaning - SetMsgFormat will set the default message instead of NULL)

-			} else

-			{

-				continue;

 			}

+			else continue;

+

 			SetExtraIcon(CList, EXTRACOLUMN_IGNORE, hItem, -1); // refresh contact's personal message icon (MSG or DOT)

 		}

-	} else if (Selection != CLSEL_DAT_NOTHING)

-	{

+	}

+	else if (Selection != CLSEL_DAT_NOTHING) {

 		if (dat->hInitContact)

 			CContactSettings(0, dat->hInitContact).SetMsgFormat(SMF_PERSONAL, Message);

 		else

@@ -488,36 +402,27 @@ void ApplySelContactsMessage(SetAwayMsgData* dat, CCList *CList, PTREEITEMARRAY
 	SetDlgItemText(hwndDlg, IDC_OK, TranslateT("OK"));

 }

 

-

 void UpdateCheckboxesState(CCList *CList)

 {

 	_ASSERT(CList);

 	PTREEITEMARRAY Selection = CList->GetSelection();

-	int I;

 	int ReplyIcon = -1;

 	int IgnoreIcon = -1;

-	for (I = 0; I < Selection->GetSize() && (IgnoreIcon != EXTRAIMGLIST_DOT || ReplyIcon != EXTRAIMGLIST_DOT); I++)

-	{

-		HTREEITEM hItem = (*Selection)[I];

+	for (int i = 0; i < Selection->GetSize() && (IgnoreIcon != EXTRAIMGLIST_DOT || ReplyIcon != EXTRAIMGLIST_DOT); i++) {

+		HTREEITEM hItem = (*Selection)[i];

 		int ItemType = CList->GetItemType(hItem);

-		if (ItemType == MCLCIT_CONTACT || ItemType == MCLCIT_INFO)

-		{

+		if (ItemType == MCLCIT_CONTACT || ItemType == MCLCIT_INFO) {

 			int CurIgnoreIcon = CList->GetExtraImage(hItem, EXTRACOLUMN_IGNORE);

 			if (IgnoreIcon == -1)

-			{

 				IgnoreIcon = CurIgnoreIcon;

-			} else if (CurIgnoreIcon != EXTRAIMGLIST_IGNORE)

-			{

+			else if (CurIgnoreIcon != EXTRAIMGLIST_IGNORE)

 				IgnoreIcon = EXTRAIMGLIST_DOT;

-			}

+

 			int CurReplyIcon = CList->GetExtraImage(hItem, EXTRACOLUMN_REPLY);

 			if (ReplyIcon == -1)

-			{

 				ReplyIcon = CurReplyIcon;

-			} else if (CurReplyIcon != ReplyIcon)

-			{

+			else if (CurReplyIcon != ReplyIcon)

 				ReplyIcon = EXTRAIMGLIST_DOT;

-			}

 		}

 	}

 	HWND hwndDlg = g_SetAwayMsgPage.GetWnd();

@@ -526,12 +431,33 @@ void UpdateCheckboxesState(CCList *CList)
 	CheckDlgButton(hwndDlg, IDC_SAWAYMSG_SENDMSG, (ReplyIcon == EXTRAIMGLIST_AUTOREPLY_ON) ? BST_CHECKED : ((ReplyIcon == EXTRAIMGLIST_AUTOREPLY_OFF) ? BST_UNCHECKED : BST_INDETERMINATE));

 }

 

-HICON g_LoadIconEx( const char* name, bool big )

+HICON g_LoadIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

-	mir_snprintf( szSettingName, sizeof( szSettingName ), "%s_%s", "", name );

+	mir_snprintf(szSettingName, sizeof(szSettingName), "%s_%s", "", name);

 	return Skin_GetIcon(szSettingName, big);

 }

+

+static struct {

+	int DlgItem, IconIndex;

+	TCHAR* Text;

+} Buttons[] = {

+	IDC_SAWAYMSG_SAVEMSG, ILI_SAVE, LPGENT("Save, replacing the selected message"),

+	IDC_SAWAYMSG_SAVEASNEW, ILI_SAVEASNEW, LPGENT("Save as a new message"),

+	IDC_SAWAYMSG_NEWCATEGORY, ILI_NEWCATEGORY, LPGENT("Create new category"),

+	IDC_SAWAYMSG_DELETE, ILI_DELETE, LPGENT("Delete"),

+	IDC_SAWAYMSG_VARS, ILI_NOICON, LPGENT("Open Variables help dialog"),

+	IDC_SAWAYMSG_OPTIONS, ILI_SETTINGS, LPGENT("Show settings menu")

+};

+

+struct {

+	int DlgItemID;

+	TCHAR* Text;

+} Tooltips[] = {

+	IDC_SAWAYMSG_IGNOREREQ, LPGENT("Don't send the status message to selected contact(s)"),

+	IDC_SAWAYMSG_SENDMSG, LPGENT("Send an autoreply to selected contact(s)"),

+};

+

 INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	static int SetMsgSplitterX, SetContactSplitterX;

@@ -541,25 +467,11 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 	static int Countdown;

 	static CMsgTree *MsgTree = NULL;

 	static CCList *CList = NULL;

-	static struct {

-		int DlgItem, IconIndex;

-		TCHAR* Text;

-	} Buttons[] = {

-		IDC_SAWAYMSG_SAVEMSG, ILI_SAVE, LPGENT("Save, replacing the selected message"),

-		IDC_SAWAYMSG_SAVEASNEW, ILI_SAVEASNEW, LPGENT("Save as a new message"),

-		IDC_SAWAYMSG_NEWCATEGORY, ILI_NEWCATEGORY, LPGENT("Create new category"),

-		IDC_SAWAYMSG_DELETE, ILI_DELETE, LPGENT("Delete"),

-		IDC_SAWAYMSG_VARS, ILI_NOICON, LPGENT("Open Variables help dialog"),

-		IDC_SAWAYMSG_OPTIONS, ILI_SETTINGS, LPGENT("Show settings menu")

-	};

-

-

-	switch (uMsg)

-	{

-		case WM_INITDIALOG:

+	switch (uMsg) {

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

 		{

 			dat = (SetAwayMsgData*)lParam;

-			TranslateDialogDefault(hwndDlg);

 			g_SetAwayMsgPage.SetWnd(hwndDlg);

 			g_SetAwayMsgPage.DBToMemToPage();

 

@@ -571,24 +483,15 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			HICON hTitleIcon = LoadSkinnedProtoIcon(szProto, Status);

 			HICON hTitleIconBig = LoadSkinnedProtoIconBig(szProto, Status);

 

-

-

-

-			if(hTitleIconBig == NULL || (HICON)CALLSERVICE_NOTFOUND == hTitleIconBig) {

+			if (hTitleIconBig == NULL || (HICON)CALLSERVICE_NOTFOUND == hTitleIconBig)

 				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hTitleIconBigElse);

-			} else {

+			else

 				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hTitleIconBig);

-			}

 

 			SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hTitleIcon);

-

-

 			SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_LIMITTEXT, AWAY_MSGDATA_MAX, 0);

 

-

-

-

-		// init window size variables / resize the window

+			// init window size variables / resize the window

 			RECT rc;

 			POINT pt;

 			GetWindowRect(GetDlgItem(hwndDlg, IDC_SAWAYMSG_MSGSPLITTER), &rc);

@@ -604,20 +507,12 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			RECT rcVars;

 			GetWindowRect(GetDlgItem(hwndDlg, IDC_SAWAYMSG_VARS), &rcVars);

 			g_VariablesButtonDX = rcContactSplitter.left - rcVars.right;

-//			GetWindowRect(GetDlgItem(hwndDlg, IDC_OK), &rc);

+

 			RECT rcOK;

 			GetWindowRect(GetDlgItem(hwndDlg, IDC_OK), &rcOK);

-			//MinMsgEditSize = rc.right - rc.left + rcContactSplitter.right - rcVars.left + 3;

 			MinMsgEditSize = rcOK.right - rc.left + rcContactSplitter.right - rcVars.left + 3;

 			rc.left = MINSPLITTERPOS;

 

-			//NightFox: use MINSPLITTERPOS as min size ;

-//			GetWindowRect(GetDlgItem(hwndDlg, IDC_SAWAYMSG_SAVEMSG), &rc);

-//			GetWindowRect(GetDlgItem(hwndDlg, IDC_SAWAYMSG_DELETE), &rc);

-//			rc.left = MINSPLITTERPOS;

-			//GetWindowRect(GetDlgItem(hwndDlg, IDC_OK), &rc);

-			//GetWindowRect(GetDlgItem(hwndDlg, IDC_OK), &rc);

-

 			pt.x = rc.right;

 			pt.y = 0;

 			ScreenToClient(hwndDlg, &pt);

@@ -625,55 +520,18 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			GetWindowRect(GetDlgItem(hwndDlg, IDC_SAWAYMSG_IGNOREREQ), &rc);

 			MinContactSplitterX = rcMsgDlg.right - rc.left + 1;

 

-			/*

-

-			//NightFox: add status bar

-

-			PROTOACCOUNT * acc = ProtoGetAccount(szProto);

-

-			//HWND hWndStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | SBARS_SIZEGRIP, NULL, hwndDlg, 999);//IDC_STATUSBAR);

-			SetWindowPos(hWndStatusBar, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);

-

-

-			SIZE sz;

-

-			HDC hdc = GetDC(hWndStatusBar);

-			HFONT hFntSave = (HFONT)SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT));

-			GetTextExtentPoint32(hdc, acc->tszAccountName, lstrlen(acc->tszAccountName), &sz);

-			sz.cx += GetSystemMetrics(SM_CXSMICON) * 3;

-			SelectObject(hdc, hFntSave);

-			ReleaseDC(hWndStatusBar, hdc);

-

-			RECT rcStatus; GetWindowRect(hWndStatusBar, &rcStatus);

-			int parts[] = { rcStatus.right-rcStatus.left - sz.cx, -1 };

-			SendMessage(hWndStatusBar, SB_SETPARTS, 2, (LPARAM)parts);

-			SendMessage(hWndStatusBar, SB_SETICON, 1, (LPARAM)LoadSkinnedProtoIcon(szProto, Status));

-			SendMessage(hWndStatusBar, SB_SETTEXT, 1, (LPARAM)acc->tszAccountName);

-			*/

-

-

-

-

-

-

-

-

-

-

-		// [try] getting dialog position

+			// [try] getting dialog position

 			int DlgPosX = db_get_dw(NULL, MOD_NAME, SAM_DB_DLGPOSX, -1);

 			int DlgPosY = db_get_dw(NULL, MOD_NAME, SAM_DB_DLGPOSY, -1);

 			int DlgSizeX = db_get_dw(NULL, MOD_NAME, SAM_DB_DLGSIZEX, -1);

 			int DlgSizeY = db_get_dw(NULL, MOD_NAME, SAM_DB_DLGSIZEY, -1);

 			int MsgSplitterX = db_get_dw(NULL, MOD_NAME, SAM_DB_MSGSPLITTERPOS, -1);

 			int ContactSplitterX = db_get_dw(NULL, MOD_NAME, SAM_DB_CONTACTSPLITTERPOS, -1);

-			if (DlgPosX >= 0 && DlgPosY >= 0 && DlgSizeX > 0 && DlgSizeY > 0 && MsgSplitterX > 0 && ContactSplitterX > 0)

-			{

+			if (DlgPosX >= 0 && DlgPosY >= 0 && DlgSizeX > 0 && DlgSizeY > 0 && MsgSplitterX > 0 && ContactSplitterX > 0) {

 				RECT rcWorkArea, rcIntersect;

 				SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0);

-				RECT rcDlgPos = {DlgPosX, DlgPosY, DlgPosX + DlgSizeX, DlgPosY + DlgSizeY};

-				if (!IntersectRect(&rcIntersect, &rcDlgPos, &rcWorkArea)) // make sure the window will be visible

-				{

+				RECT rcDlgPos = { DlgPosX, DlgPosY, DlgPosX + DlgSizeX, DlgPosY + DlgSizeY };

+				if (!IntersectRect(&rcIntersect, &rcDlgPos, &rcWorkArea)) { // make sure the window will be visible

 					DlgPosX = rcWorkArea.left;

 					DlgPosY = rcWorkArea.top;

 				}

@@ -686,13 +544,12 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			SetContactSplitterX = g_ContactSplitterX;

 			SendMessage(hwndDlg, WM_SIZE, 0, 0); // show/hide dialog controls accordingly to the settings

 

-			MsgTree = new CMsgTree(GetDlgItem(hwndDlg, IDC_SAWAYMSG_TREE)); // Attention: it's important to call NEW and DELETE in a proper order, as CMsgTree and CCList are setting their own WNDPROCs for the parent window, so we must prevent WNDPROC conflicts.

+			// Attention: it's important to call NEW and DELETE in a proper order, as CMsgTree and CCList are setting their own WNDPROCs for the parent window, so we must prevent WNDPROC conflicts.

+			MsgTree = new CMsgTree(GetDlgItem(hwndDlg, IDC_SAWAYMSG_TREE));

 			CList = NULL;

 			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE))

-			{

 				SendMessage(hwndDlg, UM_SAM_INITCLIST, 0, 0);

-			} else

-			{

+			else {

 				NMCLIST nm;

 				nm.hdr.code = MCLN_SELCHANGED;

 				nm.hdr.hwndFrom = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

@@ -702,79 +559,59 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 				SendMessage(hwndDlg, WM_NOTIFY, 0, (LPARAM)&nm);

 			}

 

-		// init message tree

-			if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_RECENTMSGSCOUNT) && g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_PERSTATUSMRM))

-			{

+			// init message tree

+			if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_RECENTMSGSCOUNT) && g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_PERSTATUSMRM)) {

 				char *szProto = dat->hInitContact ? GetContactProto(dat->hInitContact) : dat->szProtocol;

 				int ID = GetRecentGroupID((szProto || !dat->hInitContact) ? g_ProtoStates[szProto].Status : ID_STATUS_AWAY);

 				CBaseTreeItem* pTreeItem = MsgTree->GetNextItem(MTGN_CHILD | MTGN_BYID, (CBaseTreeItem*)g_Messages_RecentRootID);

-				while (pTreeItem)

-				{

-					if (pTreeItem->Flags & TIF_GROUP)

-					{

+				while (pTreeItem) {

+					if (pTreeItem->Flags & TIF_GROUP) {

 						if (pTreeItem->ID == ID)

-						{

 							pTreeItem->Flags |= TIF_EXPANDED; // leave expanded only one appropriate subgroup of Recent Messages group

-						} else

-						{

+						else

 							pTreeItem->Flags &= ~TIF_EXPANDED;

-						}

+

 						MsgTree->UpdateItem(pTreeItem->ID);

 					}

 					pTreeItem = MsgTree->GetNextItem(MTGN_NEXT, pTreeItem);

 				}

-//				InvalidateRect(GetDlgItem(hwndDlg, IDC_SAWAYMSG_TREE), NULL, true);

 			}

 			int Order;

 			CProtoSettings(dat->szProtocol).GetMsgFormat(GMF_LASTORDEFAULT, &Order);

-			if (Order >= 0)

-			{ // so just select an appropriate message tree item; MSGDATA text is filled automatically through SELCHANGED notification

+			if (Order >= 0) // so just select an appropriate message tree item; MSGDATA text is filled automatically through SELCHANGED notification

 				MsgTree->SetSelection(Order, MTSS_BYORDER);

-			}

 

-			if (dat->Message != NULL) // this allows to override the default message

-			{

+			if (dat->Message != NULL) { // this allows to override the default message

 				SetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, dat->Message);

 				SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_SETMODIFY, true, 0);

 			}

 			SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_SETSEL, 0, -1); // select all the text in the edit control

 

-		// init timer

+			// init timer

 			Countdown = (dat->ISW_Flags & ISWF_NOCOUNTDOWN) ? -1 : g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_WAITFORMSG);

 			if (Countdown == -1) // infinite

-			{

 				SetDlgItemText(hwndDlg, IDC_OK, TranslateT("OK"));

-			} else

-			{

+			else {

 				SendMessage(hwndDlg, WM_TIMER, SAM_TIMER_ID, NULL);

 				SetTimer(hwndDlg, SAM_TIMER_ID, 1000, NULL);

 			}

 

-		// init image buttons

-			int I;

-			for (I = 0; I < lengthof(Buttons); I++)

-			{

-				HWND hButton = GetDlgItem(hwndDlg, Buttons[I].DlgItem);

-				SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)TranslateTS(Buttons[I].Text), BATF_TCHAR);

+			// init image buttons

+			int i;

+			for (i = 0; i < SIZEOF(Buttons); i++) {

+				HWND hButton = GetDlgItem(hwndDlg, Buttons[i].DlgItem);

+				SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)TranslateTS(Buttons[i].Text), BATF_TCHAR);

 				SendMessage(hButton, BUTTONSETASFLATBTN, TRUE, 0);

 			}

 

-		// init tooltips

-			struct {

-				int DlgItemID;

-				TCHAR* Text;

-			} Tooltips[] = {

-				IDC_SAWAYMSG_IGNOREREQ, LPGENT("Don't send the status message to selected contact(s)"),

-				IDC_SAWAYMSG_SENDMSG, LPGENT("Send an autoreply to selected contact(s)"),

-			};

-			TOOLINFO ti = {0};

+			// init tooltips

+			TOOLINFO ti = { 0 };

 			hWndTooltips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

 			ti.cbSize = sizeof(ti);

 			ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS;

-			for (I = 0; I < lengthof(Tooltips); I++)

-			{

-				ti.uId = (UINT)GetDlgItem(hwndDlg, Tooltips[I].DlgItemID);

-				ti.lpszText = TranslateTS(Tooltips[I].Text);

+			for (i = 0; i < SIZEOF(Tooltips); i++) {

+				ti.uId = (UINT)GetDlgItem(hwndDlg, Tooltips[i].DlgItemID);

+				ti.lpszText = TranslateTS(Tooltips[i].Text);

 				SendMessage(hWndTooltips, TTM_ADDTOOL, 0, (LPARAM)&ti);

 			}

 			SendMessage(hwndDlg, UM_ICONSCHANGED, 0, 0);

@@ -783,317 +620,281 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			g_OrigEditMsgProc = (WNDPROC)SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_SAWAYMSG_MSGDATA), GWLP_WNDPROC, (LONG_PTR)MsgEditSubclassProc);

 			g_OrigSplitterProc = (WNDPROC)SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_SAWAYMSG_MSGSPLITTER), GWLP_WNDPROC, (LONG_PTR)SplitterSubclassProc);

 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSPLITTER), GWLP_WNDPROC, (LONG_PTR)SplitterSubclassProc);

-			return false;

-		} break;

-		case WM_NOTIFY:

+		}

+		return false;

+

+	case WM_NOTIFY:

+		switch (((NMHDR*)lParam)->idFrom) {

+		case IDC_SAWAYMSG_CONTACTSTREE:

 		{

-			switch (((NMHDR*)lParam)->idFrom)

+			switch (((NMHDR*)lParam)->code) // check the notification code

 			{

-				case IDC_SAWAYMSG_CONTACTSTREE:

-				{

-					switch (((NMHDR*)lParam)->code) // check the notification code

+			case NM_CLICK:

+			{

+				_ASSERT(CList);

+				HWND hTreeView = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

+				POINT pt = { (short)LOWORD(GetMessagePos()), (short)HIWORD(GetMessagePos()) };

+				ScreenToClient(hTreeView, &pt);

+				DWORD hitFlags;

+				HTREEITEM hItem = CList->HitTest(&pt, &hitFlags);

+				if (hitFlags & MCLCHT_ONITEMEXTRA) {

+					int nColumn = HIBYTE(HIWORD(hitFlags));

+					int CurIcon = CList->GetExtraImage(hItem, nColumn);

+					int ItemType = CList->GetItemType(hItem);

+					if (nColumn == EXTRACOLUMN_IGNORE) {

+						CurIcon = (CurIcon == EXTRAIMGLIST_IGNORE) ? EXTRAIMGLIST_DOT : EXTRAIMGLIST_IGNORE;

+					}

+					else {

+						_ASSERT(nColumn == EXTRACOLUMN_REPLY);

+						switch (CurIcon) {

+						case EXTRAIMGLIST_DOT: CurIcon = EXTRAIMGLIST_AUTOREPLY_OFF; break;

+						case EXTRAIMGLIST_AUTOREPLY_OFF: CurIcon = EXTRAIMGLIST_AUTOREPLY_ON; break;

+						case EXTRAIMGLIST_AUTOREPLY_ON: CurIcon = EXTRAIMGLIST_DOT; break;

+						}

+					}

+					SetExtraIcon(CList, nColumn, hItem, CurIcon);

+					if (ItemType == MCLCIT_GROUP) // set all child items

 					{

-						case NM_CLICK:

-						{

-							_ASSERT(CList);

-							HWND hTreeView = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

-							POINT pt = {(short)LOWORD(GetMessagePos()), (short)HIWORD(GetMessagePos())};

-							ScreenToClient(hTreeView, &pt);

-							DWORD hitFlags;

-							HTREEITEM hItem = CList->HitTest(&pt, &hitFlags);

-							if (hitFlags & MCLCHT_ONITEMEXTRA)

-							{

-								int nColumn = HIBYTE(HIWORD(hitFlags));

-								int CurIcon = CList->GetExtraImage(hItem, nColumn);

-								int ItemType = CList->GetItemType(hItem);

-								if (nColumn == EXTRACOLUMN_IGNORE)

-								{

-									CurIcon = (CurIcon == EXTRAIMGLIST_IGNORE) ? EXTRAIMGLIST_DOT : EXTRAIMGLIST_IGNORE;

-								} else

-								{

-									_ASSERT(nColumn == EXTRACOLUMN_REPLY);

-									switch (CurIcon)

-									{

-										case EXTRAIMGLIST_DOT: CurIcon = EXTRAIMGLIST_AUTOREPLY_OFF; break;

-										case EXTRAIMGLIST_AUTOREPLY_OFF: CurIcon = EXTRAIMGLIST_AUTOREPLY_ON; break;

-										case EXTRAIMGLIST_AUTOREPLY_ON: CurIcon = EXTRAIMGLIST_DOT; break;

-									}

-								}

-								SetExtraIcon(CList, nColumn, hItem, CurIcon);

-								if (ItemType == MCLCIT_GROUP) // set all child items

-								{

-									HTREEITEM hCurItem = CList->GetNextItem(MCLGN_CHILD, hItem);

-									HTREEITEM hLimitItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_ANY | MCLGN_NOTCHILD, hItem);

-									while (hCurItem && hCurItem != hLimitItem)

-									{

-										SetExtraIcon(CList, nColumn, hCurItem, CurIcon);

-										hCurItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_ANY | MCLGN_MULTILEVEL, hCurItem);

-									}

+						HTREEITEM hCurItem = CList->GetNextItem(MCLGN_CHILD, hItem);

+						HTREEITEM hLimitItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_ANY | MCLGN_NOTCHILD, hItem);

+						while (hCurItem && hCurItem != hLimitItem) {

+							SetExtraIcon(CList, nColumn, hCurItem, CurIcon);

+							hCurItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_ANY | MCLGN_MULTILEVEL, hCurItem);

+						}

+					}

+					SetCListGroupIcons(dat, CList);

+					UpdateCheckboxesState(CList);

+				}

+			} break;

+			case MCLN_SELCHANGED:

+			{

+				PNMCLIST nm = (PNMCLIST)lParam;

+				TCString BtnTitle(TranslateT("OK"));

+				if (CList) {

+					UpdateCheckboxesState(CList);

+				}

+				bool bOnlyInfo;

+				bool bLeaveOldMessage = nm->OldSelection == nm->NewSelection; // OldSelection == NewSelection when we send MCLN_SELCHANGED from UM_SAM_PROTOSTATUSCHANGED; seems that it's better to leave old message then

+				int nOldContacts = GetSelContactsNum(CList, nm->OldSelection);

+				int nNewContacts = GetSelContactsNum(CList, nm->NewSelection, &bOnlyInfo);

+				EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_IGNOREREQ), !bOnlyInfo);

+				if (CList) {

+					if (SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_GETMODIFY, 0, 0)) {

+						int i, J;

+						for (i = nm->OldSelection->GetSize() - 1; i >= 0; i--) {

+							for (J = nm->NewSelection->GetSize() - 1; J >= 0; J--) {

+								if ((*nm->NewSelection)[J] == (*nm->OldSelection)[i]) {

+									break;

 								}

-								SetCListGroupIcons(dat, CList);

-								UpdateCheckboxesState(CList);

 							}

-						} break;

-						case MCLN_SELCHANGED:

+							if (J < 0) {

+								break;

+							}

+						}

+						if (nNewContacts > 1) {

+							BtnTitle = TranslateT("Apply");

+						}

+						if (i >= 0 && nOldContacts) // there's at least one item in the old selection that is not present in the new one

 						{

-							PNMCLIST nm = (PNMCLIST)lParam;

-							TCString BtnTitle(TranslateT("OK"));

-							if (CList)

-							{

-								UpdateCheckboxesState(CList);

+							if ((nOldContacts == 1) || MessageBox(hwndDlg, TranslateT("Do you want to apply the message?"), TranslateT("New Away System"), MB_ICONQUESTION | MB_YESNO) == IDYES) {

+								ApplySelContactsMessage(dat, CList, nm->OldSelection);

 							}

-							bool bOnlyInfo;

-							bool bLeaveOldMessage = nm->OldSelection == nm->NewSelection; // OldSelection == NewSelection when we send MCLN_SELCHANGED from UM_SAM_PROTOSTATUSCHANGED; seems that it's better to leave old message then

-							int nOldContacts = GetSelContactsNum(CList, nm->OldSelection);

-							int nNewContacts = GetSelContactsNum(CList, nm->NewSelection, &bOnlyInfo);

-							EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_IGNOREREQ), !bOnlyInfo);

-							if (CList)

-							{

-								if (SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_GETMODIFY, 0, 0))

-								{

-									int I, J;

-									for (I = nm->OldSelection->GetSize() - 1; I >= 0; I--)

-									{

-										for (J = nm->NewSelection->GetSize() - 1; J >= 0; J--)

-										{

-											if ((*nm->NewSelection)[J] == (*nm->OldSelection)[I])

-											{

-												break;

-											}

-										}

-										if (J < 0)

-										{

-											break;

-										}

-									}

-									if (nNewContacts > 1)

-									{

-										BtnTitle = TranslateT("Apply");

-									}

-									if (I >= 0 && nOldContacts) // there's at least one item in the old selection that is not present in the new one

-									{

-										if ((nOldContacts == 1) || MessageBox(hwndDlg, TranslateT("Do you want to apply the message?"), TranslateT("New Away System"), MB_ICONQUESTION | MB_YESNO) == IDYES)

-										{

-											ApplySelContactsMessage(dat, CList, nm->OldSelection);

-										}

-									} else if (nOldContacts)

-									{

-										bLeaveOldMessage = true; // don't change the edit control text yet - we're still writing...

-									}

+						}

+						else if (nOldContacts) {

+							bLeaveOldMessage = true; // don't change the edit control text yet - we're still writing...

+						}

+					}

+				}

+				else {

+					if (nOldContacts && !nNewContacts) {

+						ApplySelContactsMessage(dat, CList, nm->OldSelection);

+					}

+				}

+

+				// determine the right new message and window title for the edit control now

+				TCString Message;

+				int Status = 0;

+				if (CList) {

+					bool MessageDetermined = false;

+					bool StatusDetermined = false;

+					int i;

+					for (i = 0; i < nm->NewSelection->GetSize(); i++) {

+						HTREEITEM hItem = (*nm->NewSelection)[i];

+						MCONTACT hContact;

+						char *szProto;

+						int ItemType = CList->GetItemType(hItem);

+						if (ItemType == MCLCIT_CONTACT) {

+							hContact = CList->GethContact(hItem);

+							_ASSERT(hContact);

+							szProto = GetContactProto(hContact);

+							_ASSERT(szProto);

+						}

+						else if (ItemType == MCLCIT_INFO) {

+							szProto = (char*)CList->GetItemParam(hItem);

+						}

+						if (ItemType == MCLCIT_CONTACT || ItemType == MCLCIT_INFO) {

+							int CurStatus = g_ProtoStates[szProto].Status;

+							if (!MessageDetermined) {

+								TCString CurMessage((ItemType == MCLCIT_CONTACT) ? CContactSettings(0, hContact).GetMsgFormat(GMF_PERSONAL) : CProtoSettings(szProto).GetMsgFormat(GMF_TEMPORARY | GMF_PERSONAL));

+								if (CurMessage == NULL) {

+									CurMessage = _T("");

 								}

-							} else

-							{

-								if (nOldContacts && !nNewContacts)

-								{

-									ApplySelContactsMessage(dat, CList, nm->OldSelection);

+								if (Message == NULL) {

+									Message = CurMessage;

 								}

-							}

-

-						// determine the right new message and window title for the edit control now

-							TCString Message;

-							int Status = 0;

-							if (CList)

-							{

-								bool MessageDetermined = false;

-								bool StatusDetermined = false;

-								int I;

-								for (I = 0; I < nm->NewSelection->GetSize(); I++)

-								{

-									HTREEITEM hItem = (*nm->NewSelection)[I];

-									MCONTACT hContact;

-									char *szProto;

-									int ItemType = CList->GetItemType(hItem);

-									if (ItemType == MCLCIT_CONTACT)

-									{

-										hContact = CList->GethContact(hItem);

-										_ASSERT(hContact);

-										szProto = GetContactProto(hContact);

-										_ASSERT(szProto);

-									} else if (ItemType == MCLCIT_INFO)

-									{

-										szProto = (char*)CList->GetItemParam(hItem);

-									}

-									if (ItemType == MCLCIT_CONTACT || ItemType == MCLCIT_INFO)

-									{

-										int CurStatus = g_ProtoStates[szProto].Status;

-										if (!MessageDetermined)

-										{

-											TCString CurMessage((ItemType == MCLCIT_CONTACT) ? CContactSettings(0, hContact).GetMsgFormat(GMF_PERSONAL) : CProtoSettings(szProto).GetMsgFormat(GMF_TEMPORARY | GMF_PERSONAL));

-											if (CurMessage == NULL)

-											{

-												CurMessage = _T("");

-											}

-											if (Message == NULL)

-											{

-												Message = CurMessage;

-											} else if (CurMessage != (const TCHAR*)Message)

-											{

-												Message = _T("");

-												BtnTitle = TranslateT("Apply");

-												MessageDetermined = true;

-											}

-										}

-										if (!StatusDetermined)

-										{

-											if (!Status)

-											{

-												Status = CurStatus;

-											} else if (CurStatus != Status)

-											{

-												Status = 0;

-												StatusDetermined = true;

-											}

-										}

-									}

+								else if (CurMessage != (const TCHAR*)Message) {

+									Message = _T("");

+									BtnTitle = TranslateT("Apply");

+									MessageDetermined = true;

 								}

-							} else if (nNewContacts) // if (!CList)

-							{

-								Status = g_ProtoStates[dat->szProtocol].Status;

-								Message = dat->hInitContact ? CContactSettings(0, dat->hInitContact).GetMsgFormat(GMF_PERSONAL) : CProtoSettings(dat->szProtocol).GetMsgFormat(GMF_TEMPORARY | GMF_PERSONAL);

 							}

-							if (!bLeaveOldMessage)

-							{

-								SetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, (Message == NULL) ? _T("") : Message);

-							}

-							SetDlgItemText(hwndDlg, IDC_OK, BtnTitle);

-							//NightFox: fix titlebar

-							//TCString WindowTitle(TranslateT("Set "));

-							TCString WindowTitle(TranslateT("Set message for"));

-							WindowTitle += _T(" \"");

-							WindowTitle += Status ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, Status, GSMDF_TCHAR) : TranslateT("Statuses");

-							//WindowTitle += TranslateT(" message");

-							if (nNewContacts == 1)

-							{

-								WindowTitle += TCString(TranslateT("\" ("));

-								MCONTACT hContact = NULL;

-								char *szProto = NULL;

-								if (CList)

-								{

-									int I;

-									for (I = 0; I < nm->NewSelection->GetSize(); I++)

-									{

-										HTREEITEM hItem = (*nm->NewSelection)[I];

-										int ItemType = CList->GetItemType(hItem);

-										if (ItemType == MCLCIT_CONTACT)

-										{

-											hContact = CList->GethContact((*nm->NewSelection)[I]);

-											break;

-										} else if (ItemType == MCLCIT_INFO)

-										{

-											szProto = (char*)CList->GetItemParam(hItem);

-											break;

-										}

-									}

-								} else

-								{

-									hContact = dat->hInitContact;

-									szProto = dat->szProtocol;

+							if (!StatusDetermined) {

+								if (!Status) {

+									Status = CurStatus;

 								}

-								if (hContact)

-								{

-

-									if (IsAnICQProto(GetContactProto(hContact))) {

-										WindowTitle += TranslateT("message for");

-										WindowTitle += _T(" ");

-									} else {

-										WindowTitle += TranslateT("for");

-										WindowTitle += _T(" ");

-									}

-

-

-									WindowTitle += (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);

-									if (!IsAnICQProto(GetContactProto(hContact)))

-									{

-										//WindowTitle += TranslateT(" (autoreply only)");

-										WindowTitle += _T(" ");

-										WindowTitle += TranslateT("available autoreply only");

-										WindowTitle += _T(")");

-									} else {

-										WindowTitle += _T(")");

-									}

-								} else

-								{

-									if (!szProto)

-									{

-										//WindowTitle += TranslateT("all contacts");

-										WindowTitle += TranslateT("all accounts");

-										WindowTitle += _T(")");

-									} else

-									{

-										//CString ProtoTitle;

-

-										/*if (CallProtoService(szProto, PS_GETNAME, 256, (LPARAM)ProtoTitle.GetBuffer(256)))

-										{ // on a failure, set ProtoTitle to an empty string

-											//ProtoTitle[0] = '\0';

-										}*/

-										//ProtoTitle.ReleaseBuffer();

-										//WindowTitle += _A2T(ProtoTitle) + TranslateT(" protocol");

-

-										PROTOACCOUNT * acc = ProtoGetAccount(szProto);

-

-										WindowTitle += acc->tszAccountName;

-										//WindowTitle += _T(" ");

-										//WindowTitle += TranslateT("account");

-										WindowTitle += _T(")");

-									}

+								else if (CurStatus != Status) {

+									Status = 0;

+									StatusDetermined = true;

 								}

-							} else {

-								WindowTitle += _T("\"");

 							}

-							SetWindowText(hwndDlg, WindowTitle);

-						} break;

+						}

 					}

-				} break;

-				case IDC_SAWAYMSG_TREE:

+				}

+				else if (nNewContacts) // if (!CList)

 				{

-					switch (((NMHDR*)lParam)->code)

-					{

-						case MTN_SELCHANGED:

-						{

-							if (!UpdateLock)

-							{

-								PNMMSGTREE pnm = (PNMMSGTREE)lParam;

-								if (pnm->ItemNew && !(pnm->ItemNew->Flags & (TIF_ROOTITEM | TIF_GROUP)))

-								{

-									SetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, ((CTreeItem*)pnm->ItemNew)->User_Str1);

-									SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_SAWAYMSG_MSGDATA, EN_CHANGE), (LPARAM)GetDlgItem(hwndDlg, IDC_SAWAYMSG_MSGDATA));

-									SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_SETMODIFY, true, 0);

-									EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_SAVEMSG), true);

-								} else

-								{

-									EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_SAVEMSG), false);

-								}

-								EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_DELETE), pnm->ItemNew && !(pnm->ItemNew->Flags & TIF_ROOTITEM));

+					Status = g_ProtoStates[dat->szProtocol].Status;

+					Message = dat->hInitContact ? CContactSettings(0, dat->hInitContact).GetMsgFormat(GMF_PERSONAL) : CProtoSettings(dat->szProtocol).GetMsgFormat(GMF_TEMPORARY | GMF_PERSONAL);

+				}

+				if (!bLeaveOldMessage) {

+					SetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, (Message == NULL) ? _T("") : Message);

+				}

+				SetDlgItemText(hwndDlg, IDC_OK, BtnTitle);

+				//NightFox: fix titlebar

+				//TCString WindowTitle(TranslateT("Set "));

+				TCString WindowTitle(TranslateT("Set message for"));

+				WindowTitle += _T(" \"");

+				WindowTitle += Status ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, Status, GSMDF_TCHAR) : TranslateT("Statuses");

+				//WindowTitle += TranslateT(" message");

+				if (nNewContacts == 1) {

+					WindowTitle += TCString(TranslateT("\" ("));

+					MCONTACT hContact = NULL;

+					char *szProto = NULL;

+					if (CList) {

+						int i;

+						for (i = 0; i < nm->NewSelection->GetSize(); i++) {

+							HTREEITEM hItem = (*nm->NewSelection)[i];

+							int ItemType = CList->GetItemType(hItem);

+							if (ItemType == MCLCIT_CONTACT) {

+								hContact = CList->GethContact((*nm->NewSelection)[i]);

+								break;

 							}

-						} break;

+							else if (ItemType == MCLCIT_INFO) {

+								szProto = (char*)CList->GetItemParam(hItem);

+								break;

+							}

+						}

+					}

+					else {

+						hContact = dat->hInitContact;

+						szProto = dat->szProtocol;

+					}

+					if (hContact) {

+

+						if (IsAnICQProto(GetContactProto(hContact))) {

+							WindowTitle += TranslateT("message for");

+							WindowTitle += _T(" ");

+						}

+						else {

+							WindowTitle += TranslateT("for");

+							WindowTitle += _T(" ");

+						}

+

+

+						WindowTitle += (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);

+						if (!IsAnICQProto(GetContactProto(hContact))) {

+							//WindowTitle += TranslateT(" (autoreply only)");

+							WindowTitle += _T(" ");

+							WindowTitle += TranslateT("available autoreply only");

+							WindowTitle += _T(")");

+						}

+						else {

+							WindowTitle += _T(")");

+						}

+					}

+					else {

+						if (!szProto) {

+							//WindowTitle += TranslateT("all contacts");

+							WindowTitle += TranslateT("all accounts");

+							WindowTitle += _T(")");

+						}

+						else {

+							//CString ProtoTitle;

+

+							/*if (CallProtoService(szProto, PS_GETNAME, 256, (LPARAM)ProtoTitle.GetBuffer(256)))

+							{ // on a failure, set ProtoTitle to an empty string

+							//ProtoTitle[0] = '\0';

+							}*/

+							//ProtoTitle.ReleaseBuffer();

+							//WindowTitle += _A2T(ProtoTitle) + TranslateT(" protocol");

+

+							PROTOACCOUNT * acc = ProtoGetAccount(szProto);

+

+							WindowTitle += acc->tszAccountName;

+							//WindowTitle += _T(" ");

+							//WindowTitle += TranslateT("account");

+							WindowTitle += _T(")");

+						}

 					}

-				} break;

+				}

+				else {

+					WindowTitle += _T("\"");

+				}

+				SetWindowText(hwndDlg, WindowTitle);

+			} break;

 			}

-			return true;

-		} break;

-		case WM_TIMER:

-		{

-			if (wParam == SAM_TIMER_ID)

+			break;

+		case IDC_SAWAYMSG_TREE:

+			switch (((NMHDR*)lParam)->code) {

+			case MTN_SELCHANGED:

 			{

-				if (!Countdown)

-				{

-					SendMessage(hwndDlg, UM_SAM_APPLYANDCLOSE, 0, 0);

-					return true;

+				if (!UpdateLock) {

+					PNMMSGTREE pnm = (PNMMSGTREE)lParam;

+					if (pnm->ItemNew && !(pnm->ItemNew->Flags & (TIF_ROOTITEM | TIF_GROUP))) {

+						SetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, ((CTreeItem*)pnm->ItemNew)->User_Str1);

+						SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_SAWAYMSG_MSGDATA, EN_CHANGE), (LPARAM)GetDlgItem(hwndDlg, IDC_SAWAYMSG_MSGDATA));

+						SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_SETMODIFY, true, 0);

+						EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_SAVEMSG), true);

+					}

+					else {

+						EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_SAVEMSG), false);

+					}

+					EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_DELETE), pnm->ItemNew && !(pnm->ItemNew->Flags & TIF_ROOTITEM));

 				}

-				TCHAR BtnTitle[64];

-				_sntprintf(BtnTitle, sizeof(BtnTitle), TranslateT("Closing in %d"), Countdown);

-				SetDlgItemText(hwndDlg, IDC_OK, BtnTitle);

-				Countdown--;

+			} break;

 			}

 		} break;

-		case UM_SAM_INITCLIST:

-		{

-			_ASSERT(!CList);

-			CList = new CCList(GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE));

+		}

+		return true;

 

-		// init contact tree

-			HIMAGELIST hil;

-			hil = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 5, 2);

+	case WM_TIMER:

+		if (wParam == SAM_TIMER_ID) {

+			if (!Countdown) {

+				SendMessage(hwndDlg, UM_SAM_APPLYANDCLOSE, 0, 0);

+				return true;

+			}

+			TCHAR BtnTitle[64];

+			_sntprintf(BtnTitle, sizeof(BtnTitle), TranslateT("Closing in %d"), Countdown);

+			SetDlgItemText(hwndDlg, IDC_OK, BtnTitle);

+			Countdown--;

+		}

+		break;

+

+	case UM_SAM_INITCLIST:

+		_ASSERT(!CList);

+		CList = new CCList(GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE));

+		{

+			// init contact tree

+			HIMAGELIST hil = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 5, 2);

 			ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_DOT)));

 			ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_IGNORE)));

 			ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_MSGICON)));

@@ -1106,21 +907,19 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			int ProtoCount;

 			PROTOCOLDESCRIPTOR **proto;

 			CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&ProtoCount, (LPARAM)&proto);

-			int I;

-			for (I = 0; I < ProtoCount; I++)

-			{

-				if (proto[I]->type == PROTOTYPE_PROTOCOL && CallProtoService(proto[I]->szName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) // don't forget to change Recent Message Save loop in the UM_SAM_APPLYANDCLOSE if you're changing something here

+			int i;

+			for (i = 0; i < ProtoCount; i++) {

+				if (proto[i]->type == PROTOTYPE_PROTOCOL && CallProtoService(proto[i]->szName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) // don't forget to change Recent Message Save loop in the UM_SAM_APPLYANDCLOSE if you're changing something here

 				{

 					//CString ProtoTitle;

-					//CallProtoService(proto[I]->szName, PS_GETNAME, 256, (LPARAM)ProtoTitle.GetBuffer(256));

+					//CallProtoService(proto[i]->szName, PS_GETNAME, 256, (LPARAM)ProtoTitle.GetBuffer(256));

 					//ProtoTitle.ReleaseBuffer();

 

-					PROTOACCOUNT * acc = ProtoGetAccount(proto[I]->szName);

+					PROTOACCOUNT * acc = ProtoGetAccount(proto[i]->szName);

 					//NightFox: protocols -> accounts

-					//hItem = CList->AddInfo(TCString(_T("* ")) + _A2T(ProtoTitle) + TranslateT(" contacts *"), CLC_ROOT, hItem, (LPARAM)proto[I]->szName, LoadSkinnedProtoIcon(proto[I]->szName, g_ProtoStates[proto[I]->szName].Status));

-					hItem = CList->AddInfo(TCString(_T("* ")) + acc->tszAccountName/* + TranslateT(" contacts *")*/ + _T(" *"), CLC_ROOT, hItem, (LPARAM)proto[I]->szName, LoadSkinnedProtoIcon(proto[I]->szName, g_ProtoStates[proto[I]->szName].Status));

-					if (dat->szProtocol && !strcmp(proto[I]->szName, dat->szProtocol))

-					{

+					//hItem = CList->AddInfo(TCString(_T("* ")) + _A2T(ProtoTitle) + TranslateT(" contacts *"), CLC_ROOT, hItem, (LPARAM)proto[i]->szName, LoadSkinnedProtoIcon(proto[i]->szName, g_ProtoStates[proto[i]->szName].Status));

+					hItem = CList->AddInfo(TCString(_T("* ")) + acc->tszAccountName/* + TranslateT(" contacts *")*/ + _T(" *"), CLC_ROOT, hItem, (LPARAM)proto[i]->szName, LoadSkinnedProtoIcon(proto[i]->szName, g_ProtoStates[proto[i]->szName].Status));

+					if (dat->szProtocol && !strcmp(proto[i]->szName, dat->szProtocol)) {

 						hSelItem = hItem;

 					}

 				}

@@ -1128,17 +927,13 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 

 			MCONTACT hContact = db_find_first();

 			CList->SetRedraw(false);

-			do

-			{

+			do {

 				char *szProto = GetContactProto(hContact);

-				if (szProto)

-				{

+				if (szProto) {

 					int Flag1 = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

-					if ((Flag1 & PF1_IM) == PF1_IM || Flag1 & PF1_INDIVMODEMSG)

-					{ // check if the protocol supports message sending/receiving or individual status messages before adding this contact

+					if ((Flag1 & PF1_IM) == PF1_IM || Flag1 & PF1_INDIVMODEMSG) { // check if the protocol supports message sending/receiving or individual status messages before adding this contact

 						HTREEITEM hItem = CList->AddContact(hContact);

-						if (dat->hInitContact == hContact)

-						{

+						if (dat->hInitContact == hContact) {

 							hSelItem = hItem;

 						}

 					}

@@ -1146,68 +941,59 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			} while (hContact = db_find_next(hContact));

 			CList->SortContacts();

 			hItem = CLC_ROOT;

-			while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_CONTACT | MCLGN_INFO | MCLGN_MULTILEVEL, hItem))

-			{

+			while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_CONTACT | MCLGN_INFO | MCLGN_MULTILEVEL, hItem)) {

 				SetExtraIcon(CList, EXTRACOLUMN_IGNORE, hItem, -1);

 				SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, -1);

 			}

 			SetCListGroupIcons(dat, CList);

 			CList->SetRedraw(true); // SetRedraw must be before SelectItem - otherwise SelectItem won't change scrollbar position to make the selected contact visible

 			CList->SelectItem(hSelItem); // must be selected after setting all extra icons, to set checkboxes properly

-		} break;

-		case UM_SAM_APPLYANDCLOSE:

+		}

+		break;

+

+	case UM_SAM_APPLYANDCLOSE:

+		KillTimer(hwndDlg, SAM_TIMER_ID);

+		if (CList) {

+			CList->SelectItem(NULL);

+		}

+		else {

+			NMCLIST nm;

+			nm.hdr.code = MCLN_SELCHANGED;

+			nm.hdr.hwndFrom = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

+			nm.hdr.idFrom = IDC_SAWAYMSG_CONTACTSTREE;

+			nm.OldSelection = CLSEL_DAT_CONTACT;

+			nm.NewSelection = CLSEL_DAT_NOTHING;

+			SendMessage(hwndDlg, WM_NOTIFY, 0, (LPARAM)&nm);

+		}

+		MsgTree->Save();

 		{

-			KillTimer(hwndDlg, SAM_TIMER_ID);

-			if (CList)

-			{

-				CList->SelectItem(NULL);

-			} else

-			{

-				NMCLIST nm;

-				nm.hdr.code = MCLN_SELCHANGED;

-				nm.hdr.hwndFrom = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

-				nm.hdr.idFrom = IDC_SAWAYMSG_CONTACTSTREE;

-				nm.OldSelection = CLSEL_DAT_CONTACT;

-				nm.NewSelection = CLSEL_DAT_NOTHING;

-				SendMessage(hwndDlg, WM_NOTIFY, 0, (LPARAM)&nm);

-			}

-			MsgTree->Save();

-		// save Recent Messages

+			// save Recent Messages

 			int ProtoCount;

 			PROTOCOLDESCRIPTOR **proto;

 			CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&ProtoCount, (LPARAM)&proto);

-			int I;

-			for (I = 0; I < ProtoCount; I++)

-			{

-				if (proto[I]->type == PROTOTYPE_PROTOCOL && CallProtoService(proto[I]->szName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND)

-				{

-					TCString Message(CProtoSettings(proto[I]->szName).GetMsgFormat(GMF_PERSONAL)); // yes, we don't specify GMF_TEMPORARY here, because we don't need to save it

+			for (int i = 0; i < ProtoCount; i++) {

+				if (proto[i]->type == PROTOTYPE_PROTOCOL && CallProtoService(proto[i]->szName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) {

+					TCString Message(CProtoSettings(proto[i]->szName).GetMsgFormat(GMF_PERSONAL)); // yes, we don't specify GMF_TEMPORARY here, because we don't need to save it

 					if (Message != NULL)

-					{

-						CProtoSettings(proto[I]->szName).SetMsgFormat(SMF_LAST, Message); // if the user set a message for this protocol, save it to the recent messages

-					}

-					ChangeProtoMessages(proto[I]->szName, g_ProtoStates[proto[I]->szName].Status, TCString(NULL)); // and actual setting of a status message for the protocol

+						CProtoSettings(proto[i]->szName).SetMsgFormat(SMF_LAST, Message); // if the user set a message for this protocol, save it to the recent messages

+					ChangeProtoMessages(proto[i]->szName, g_ProtoStates[proto[i]->szName].Status, TCString(NULL)); // and actual setting of a status message for the protocol

 				}

 			}

 			TCString Message(CProtoSettings().GetMsgFormat(GMF_PERSONAL));

 			if (Message != NULL)

-			{

 				CProtoSettings().SetMsgFormat(SMF_LAST, Message); // save the global message to the recent messages

-			}

+

 			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_AUTOSAVEDLGSETTINGS))

-			{

 				SendMessage(hwndDlg, UM_SAM_SAVEDLGSETTINGS, 0, 0);

-			}

+

 			if (dat->IsModeless)

-			{

 				DestroyWindow(hwndDlg);

-			} else

-			{

+			else

 				EndDialog(hwndDlg, 2);

-			}

-			return true;

-		} break;

-		case UM_SAM_SAVEDLGSETTINGS:

+		}

+		return true;

+

+	case UM_SAM_SAVEDLGSETTINGS:

 		{

 			RECT rcRect;

 			GetWindowRect(hwndDlg, &rcRect);

@@ -1218,376 +1004,318 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			db_set_dw(NULL, MOD_NAME, SAM_DB_MSGSPLITTERPOS, g_MsgSplitterX);

 			db_set_dw(NULL, MOD_NAME, SAM_DB_CONTACTSPLITTERPOS, g_ContactSplitterX);

 			g_SetAwayMsgPage.PageToMemToDB();

-		} break;

-		case UM_SAM_REPLYSETTINGCHANGED:

-		{ // wParam = (HANDLE)hContact

-			if (CList)

-			{

-				HTREEITEM hItem = CLC_ROOT;

-				if (!wParam)

-				{ // it's the global autoreply setting

-					while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_INFO | MCLGN_MULTILEVEL, hItem))

-					{

-						if (!CList->GetItemParam(hItem))

-						{ // we found the item

-							SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, -1); // update it

-							break;

-						}

+		}

+		break;

+

+	case UM_SAM_REPLYSETTINGCHANGED:

+		if (CList) {

+			HTREEITEM hItem = CLC_ROOT;

+			if (!wParam) { // it's the global autoreply setting

+				while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_INFO | MCLGN_MULTILEVEL, hItem)) {

+					if (!CList->GetItemParam(hItem)) { // we found the item

+						SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, -1); // update it

+						break;

 					}

-				} else

-				{ // it's a contact's autoreply setting

-					while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_CONTACT | MCLGN_MULTILEVEL, hItem))

-					{

-						MCONTACT hContact = CList->GethContact(hItem);

-						if (CList->GethContact(hItem) == wParam)

-						{ // we found the item

-							SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, -1); // update it

-							break;

-						}

+				}

+			}

+			else { // it's a contact's autoreply setting

+				while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_CONTACT | MCLGN_MULTILEVEL, hItem)) {

+					MCONTACT hContact = CList->GethContact(hItem);

+					if (CList->GethContact(hItem) == wParam) { // we found the item

+						SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, -1); // update it

+						break;

 					}

 				}

-				UpdateCheckboxesState(CList);

 			}

-		} break;

-		case UM_SAM_PROTOSTATUSCHANGED:

-		{ // wParam = (char*)szProto

-			if (CList)

-			{

-				HTREEITEM hItem = CLC_ROOT;

-				while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_CONTACT | MCLGN_INFO | MCLGN_MULTILEVEL, hItem))

-				{

-					if (CList->GetItemType(hItem) == MCLCIT_INFO)

-					{

-						char *szProto = (char*)CList->GetItemParam(hItem);

-						if (!wParam || !lstrcmpA(szProto, (char*)wParam))

-						{

-							CList->SetInfoIcon(hItem, LoadSkinnedProtoIcon(szProto, g_ProtoStates[szProto].Status));

-						}

+			UpdateCheckboxesState(CList);

+		}

+		break;

+	case UM_SAM_PROTOSTATUSCHANGED:

+		if (CList) {

+			HTREEITEM hItem = CLC_ROOT;

+			while (hItem = CList->GetNextItem(MCLGN_NEXT | MCLGN_CONTACT | MCLGN_INFO | MCLGN_MULTILEVEL, hItem)) {

+				if (CList->GetItemType(hItem) == MCLCIT_INFO) {

+					char *szProto = (char*)CList->GetItemParam(hItem);

+					if (!wParam || !lstrcmpA(szProto, (char*)wParam)) {

+						CList->SetInfoIcon(hItem, LoadSkinnedProtoIcon(szProto, g_ProtoStates[szProto].Status));

 					}

-					SetExtraIcon(CList, EXTRACOLUMN_IGNORE, hItem, -1);

-					SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, -1);

 				}

-				SetCListGroupIcons(dat, CList);

+				SetExtraIcon(CList, EXTRACOLUMN_IGNORE, hItem, -1);

+				SetExtraIcon(CList, EXTRACOLUMN_REPLY, hItem, -1);

 			}

-/*			dat->hInitContact = NULL; // TODO: test it

-			dat->szProtocol = (char*)wParam;*/

+			SetCListGroupIcons(dat, CList);

+		}

+		{

 			NMCLIST nm;

 			nm.hdr.code = MCLN_SELCHANGED;

 			nm.hdr.hwndFrom = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

 			nm.hdr.idFrom = IDC_SAWAYMSG_CONTACTSTREE;

 			nm.OldSelection = nm.NewSelection = CList ? CList->GetSelection() : CLSEL_DAT_CONTACT;

 			SendMessage(hwndDlg, WM_NOTIFY, 0, (LPARAM)&nm); // everything else is in the MCLN_SELCHANGED handler, so we'll just call it from here.

-		} break;

-		case UM_ICONSCHANGED:

-		{

-			int I;

-			for (I = 0; I < lengthof(Buttons); I++)

-			{

-				if (Buttons[I].IconIndex != ILI_NOICON)

-				{

-					SendDlgItemMessage(hwndDlg, Buttons[I].DlgItem, BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_IconList[Buttons[I].IconIndex]);

-				}

-			}

-			my_variables_skin_helpbutton(hwndDlg, IDC_SAWAYMSG_VARS);

-		} break;

-		case WM_COMMAND:

-		{

-			switch (HIWORD(wParam))

-			{

-				case EN_CHANGE:

+		}

+		break;

+

+	case UM_ICONSCHANGED:

+		for (int i = 0; i < SIZEOF(Buttons); i++)

+			if (Buttons[i].IconIndex != ILI_NOICON)

+				SendDlgItemMessage(hwndDlg, Buttons[i].DlgItem, BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_IconList[Buttons[i].IconIndex]);

+

+		my_variables_skin_helpbutton(hwndDlg, IDC_SAWAYMSG_VARS);

+		break;

+

+	case WM_COMMAND:

+		switch (HIWORD(wParam)) {

+		case EN_CHANGE:

+			if (LOWORD(wParam) == IDC_SAWAYMSG_MSGDATA)

+				SetDlgItemText(hwndDlg, IDC_OK, TranslateTS((GetSelContactsNum(CList) > 1) ? LPGENT("Apply") : LPGENT("OK")));

+			break;

+

+		case EN_KILLFOCUS:

+			if (LOWORD(wParam) == IDC_SAWAYMSG_MSGDATA && GetForegroundWindow() == hwndDlg)

+				SendMessage(hwndDlg, UM_SAM_KILLTIMER, 0, 0);

+			break;

+

+		case BN_CLICKED:

+			switch (LOWORD(wParam)) {

+			case IDC_SAWAYMSG_IGNOREREQ:

+				_ASSERT(CList);

 				{

-					if (LOWORD(wParam) == IDC_SAWAYMSG_MSGDATA)

-					{

-						SetDlgItemText(hwndDlg, IDC_OK, TranslateTS((GetSelContactsNum(CList) > 1) ? LPGENT("Apply") : LPGENT("OK")));

+					int Ignore = IsDlgButtonChecked(hwndDlg, IDC_SAWAYMSG_IGNOREREQ) == BST_CHECKED;

+					EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_SENDMSG), !Ignore);

+					PTREEITEMARRAY Selection = CList->GetSelection();

+					int i;

+					for (i = 0; i < Selection->GetSize(); i++) {

+						if (CList->GetItemType((*Selection)[i]) == MCLCIT_CONTACT) {

+							SetExtraIcon(CList, EXTRACOLUMN_IGNORE, (*Selection)[i], Ignore ? EXTRAIMGLIST_IGNORE : EXTRAIMGLIST_DOT);

+						}

 					}

-				} break;

-				case EN_KILLFOCUS:

-				{

-					if (LOWORD(wParam) == IDC_SAWAYMSG_MSGDATA && GetForegroundWindow() == hwndDlg)

-					{

-						SendMessage(hwndDlg, UM_SAM_KILLTIMER, 0, 0);

+					if (Selection->GetSize() == 1) {

+						CList->EnsureVisible((*Selection)[0]);

 					}

-				} break;

-				case BN_CLICKED:

+					SetCListGroupIcons(dat, CList);

+				}

+				break;

+

+			case IDC_SAWAYMSG_SENDMSG:

+				_ASSERT(CList);

 				{

-					switch (LOWORD(wParam))

-					{

-						case IDC_SAWAYMSG_IGNOREREQ:

-						{

-							_ASSERT(CList);

-							int Ignore = IsDlgButtonChecked(hwndDlg, IDC_SAWAYMSG_IGNOREREQ) == BST_CHECKED;

-							EnableWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_SENDMSG), !Ignore);

-							PTREEITEMARRAY Selection = CList->GetSelection();

-							int I;

-							for (I = 0; I < Selection->GetSize(); I++)

-							{

-								if (CList->GetItemType((*Selection)[I]) == MCLCIT_CONTACT)

-								{

-									SetExtraIcon(CList, EXTRACOLUMN_IGNORE, (*Selection)[I], Ignore ? EXTRAIMGLIST_IGNORE : EXTRAIMGLIST_DOT);

-								}

-							}

-							if (Selection->GetSize() == 1)

-							{

-								CList->EnsureVisible((*Selection)[0]);

-							}

-							SetCListGroupIcons(dat, CList);

-						} break;

-						case IDC_SAWAYMSG_SENDMSG:

-						{

-							_ASSERT(CList);

-							int Reply = IsDlgButtonChecked(hwndDlg, IDC_SAWAYMSG_SENDMSG);

-							int ReplyIcon = (Reply == BST_CHECKED) ? EXTRAIMGLIST_AUTOREPLY_ON : ((Reply == BST_UNCHECKED) ? EXTRAIMGLIST_AUTOREPLY_OFF : EXTRAIMGLIST_DOT);

-							PTREEITEMARRAY Selection = CList->GetSelection();

-							int I;

-							for (I = 0; I < Selection->GetSize(); I++)

-							{

-								SetExtraIcon(CList, EXTRACOLUMN_REPLY, (*Selection)[I], ReplyIcon);

-							}

-							if (Selection->GetSize() == 1)

-							{

-								CList->EnsureVisible((*Selection)[0]);

-							}

-							SetCListGroupIcons(dat, CList);

-						} break;

-						case IDC_SAWAYMSG_OPTIONS:

-						{

-							HMENU hMenu = LoadMenu(g_hInstance, MAKEINTRESOURCE(IDR_SAM_OPTIONS));

-							_ASSERT(hMenu);

-							HMENU hPopupMenu = GetSubMenu(hMenu, 0);

-							TranslateMenu(hPopupMenu);

-							CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_SHOWMSGTREE, MF_BYCOMMAND | (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE) ? MF_CHECKED : MF_UNCHECKED));

-							CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_SHOWCONTACTTREE, MF_BYCOMMAND | (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE) ? MF_CHECKED : MF_UNCHECKED));

-							CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_AUTOSAVEDLGSETTINGS, MF_BYCOMMAND | (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_AUTOSAVEDLGSETTINGS) ? MF_CHECKED : MF_UNCHECKED));

-							int VariablesInstalled = ServiceExists(MS_VARS_FORMATSTRING);

-							CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_DISABLEVARIABLES, MF_BYCOMMAND | ((g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_DISABLEVARIABLES) || !VariablesInstalled) ? MF_CHECKED : MF_UNCHECKED));

-							if (!VariablesInstalled)

-							{

-								EnableMenuItem(hPopupMenu, IDM_SAM_OPTIONS_DISABLEVARIABLES, MF_BYCOMMAND | MF_GRAYED);

-							}

-							switch (TrackPopupMenu(hPopupMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD, (short)LOWORD(GetMessagePos()), (short)HIWORD(GetMessagePos()), 0, hwndDlg, NULL))

-							{

-								case IDM_SAM_OPTIONS_SHOWMSGTREE:

-								{

-									int bShow = !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE);

-									g_SetAwayMsgPage.SetValue(IDS_SAWAYMSG_SHOWMSGTREE, bShow);

-									RECT rcDlg;

-									GetWindowRect(hwndDlg, &rcDlg);

-									rcDlg.left -= bShow ? g_MsgSplitterX : -g_MsgSplitterX;

-									SendMessage(hwndDlg, WM_SIZING, WMSZ_LEFT, (LPARAM)&rcDlg);

-									SetWindowPos(hwndDlg, NULL, rcDlg.left, rcDlg.top, rcDlg.right - rcDlg.left, rcDlg.bottom - rcDlg.top, SWP_NOZORDER);

-									SendMessage(hwndDlg, WM_SIZE, 0, 0); // show/hide dialog controls accordingly

-								} break;

-								case IDM_SAM_OPTIONS_SHOWCONTACTTREE:

-								{

-									int bShow = !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE);

-									if (bShow && !CList)

-									{

-										NMCLIST nm;

-										nm.hdr.code = MCLN_SELCHANGED;

-										nm.hdr.hwndFrom = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

-										nm.hdr.idFrom = IDC_SAWAYMSG_CONTACTSTREE;

-										nm.OldSelection = CLSEL_DAT_CONTACT;

-										nm.NewSelection = CLSEL_DAT_NOTHING;

-										SendMessage(hwndDlg, WM_NOTIFY, 0, (LPARAM)&nm); // save current message

-										SendMessage(hwndDlg, UM_SAM_INITCLIST, 0, 0);

-									}

-									g_SetAwayMsgPage.SetValue(IDS_SAWAYMSG_SHOWCONTACTTREE, bShow);

-									RECT rcDlg;

-									GetWindowRect(hwndDlg, &rcDlg);

-									rcDlg.right += bShow ? g_ContactSplitterX : -g_ContactSplitterX;

-									SendMessage(hwndDlg, WM_SIZING, WMSZ_RIGHT, (LPARAM)&rcDlg);

-									SetWindowPos(hwndDlg, NULL, 0, 0, rcDlg.right - rcDlg.left, rcDlg.bottom - rcDlg.top, SWP_NOZORDER | SWP_NOMOVE);

-									SendMessage(hwndDlg, WM_SIZE, 0, 0); // show/hide dialog controls accordingly

-								} break;

-								case IDM_SAM_OPTIONS_AUTOSAVEDLGSETTINGS:

-								{

-									g_SetAwayMsgPage.SetDBValue(IDS_SAWAYMSG_AUTOSAVEDLGSETTINGS, !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_AUTOSAVEDLGSETTINGS));

-								} break;

-								case IDM_SAM_OPTIONS_SAVEDLGSETTINGSNOW:

-								{

-									SendMessage(hwndDlg, UM_SAM_SAVEDLGSETTINGS, 0, 0);

-								} break;

-								case IDM_SAM_OPTIONS_DISABLEVARIABLES:

-								{

-									g_SetAwayMsgPage.SetDBValue(IDS_SAWAYMSG_DISABLEVARIABLES, !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_DISABLEVARIABLES));

-								} break;

-							}

-							DestroyMenu(hMenu);

-						} break;

-						case IDC_SAWAYMSG_SAVEMSG:

-						{

-							CBaseTreeItem* TreeItem = MsgTree->GetSelection();

-							if (TreeItem && !(TreeItem->Flags & TIF_ROOTITEM))

-							{

-								MsgTree->EnsureVisible(TreeItem->hItem);

-								TCString NewMsg;

-								GetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, NewMsg.GetBuffer(AWAY_MSGDATA_MAX), AWAY_MSGDATA_MAX);

-								NewMsg.ReleaseBuffer();

-								if (((CTreeItem*)TreeItem)->User_Str1 != (const TCHAR*)NewMsg)

-								{

-									((CTreeItem*)TreeItem)->User_Str1 = NewMsg;

-									MsgTree->SetModified(true);

-								}

-							}

-						} break;

-						case IDC_SAWAYMSG_SAVEASNEW:

-						{

-							TCString Text;

-							GetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, Text.GetBuffer(AWAY_MSGDATA_MAX), AWAY_MSGDATA_MAX);

-							Text.ReleaseBuffer();

-							UpdateLock++;

-							CTreeItem* TreeItem = MsgTree->AddMessage();

-							UpdateLock--;

-							TreeItem->User_Str1 = Text;

-						} break;

-						case IDC_SAWAYMSG_NEWCATEGORY:

-						{

-							MsgTree->AddCategory();

-						} break;

-						case IDC_SAWAYMSG_DELETE:

-						{

-							MsgTree->EnsureVisible(MsgTree->GetSelection()->hItem);

-							MsgTree->DeleteSelectedItem();

-						} break;

-						case IDC_SAWAYMSG_VARS:

-						{

-							my_variables_showhelp(hwndDlg, IDC_SAWAYMSG_MSGDATA);

-						} break;

-						case IDC_OK:

-						{

-						// save OK button title before resetting it in SetSelContactsMessage

-							TCString BtnTitle;

-							GetDlgItemText(hwndDlg, IDC_OK, BtnTitle.GetBuffer(64), 64);

-							BtnTitle.ReleaseBuffer();

-							ApplySelContactsMessage(dat, CList);

-							if (BtnTitle != (const TCHAR*)TranslateT("Apply"))

-							{

-								SendMessage(hwndDlg, UM_SAM_APPLYANDCLOSE, 0, 0);

-							}

-						} break;

-					}

-				} break;

-			}

-		} break;

-		case UM_SAM_SPLITTERMOVED:

-		{

-			switch (lParam)

-			{

-				RECT rc;

-				POINT pt;

-				case IDC_SAWAYMSG_MSGSPLITTER:

+					int Reply = IsDlgButtonChecked(hwndDlg, IDC_SAWAYMSG_SENDMSG);

+					int ReplyIcon = (Reply == BST_CHECKED) ? EXTRAIMGLIST_AUTOREPLY_ON : ((Reply == BST_UNCHECKED) ? EXTRAIMGLIST_AUTOREPLY_OFF : EXTRAIMGLIST_DOT);

+					PTREEITEMARRAY Selection = CList->GetSelection();

+					for (int i = 0; i < Selection->GetSize(); i++)

+						SetExtraIcon(CList, EXTRACOLUMN_REPLY, (*Selection)[i], ReplyIcon);

+					if (Selection->GetSize() == 1)

+						CList->EnsureVisible((*Selection)[0]);

+					SetCListGroupIcons(dat, CList);

+				}

+				break;

+			case IDC_SAWAYMSG_OPTIONS:

 				{

-					GetClientRect(hwndDlg, &rc);

-					pt.x = wParam;

-					pt.y = 0;

-					ScreenToClient(hwndDlg, &pt);

-					g_MsgSplitterX = (pt.x < MINSPLITTERPOS) ? MINSPLITTERPOS : pt.x;

-					int MaxSetSplitterX = rc.right - MINSPLITTERPOS + 2;

-					int MaxSplitterX = MaxSetSplitterX;

-					if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE))

-					{

-						MaxSetSplitterX -= g_ContactSplitterX;

-						MaxSplitterX -= MINSPLITTERPOS;

-					}

-					if (g_MsgSplitterX > MaxSetSplitterX)

-					{

-						if (g_MsgSplitterX > MaxSplitterX)

+					HMENU hMenu = LoadMenu(g_hInstance, MAKEINTRESOURCE(IDR_SAM_OPTIONS));

+					_ASSERT(hMenu);

+					HMENU hPopupMenu = GetSubMenu(hMenu, 0);

+					TranslateMenu(hPopupMenu);

+					CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_SHOWMSGTREE, MF_BYCOMMAND | (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE) ? MF_CHECKED : MF_UNCHECKED));

+					CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_SHOWCONTACTTREE, MF_BYCOMMAND | (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE) ? MF_CHECKED : MF_UNCHECKED));

+					CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_AUTOSAVEDLGSETTINGS, MF_BYCOMMAND | (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_AUTOSAVEDLGSETTINGS) ? MF_CHECKED : MF_UNCHECKED));

+					int VariablesInstalled = ServiceExists(MS_VARS_FORMATSTRING);

+					CheckMenuItem(hPopupMenu, IDM_SAM_OPTIONS_DISABLEVARIABLES, MF_BYCOMMAND | ((g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_DISABLEVARIABLES) || !VariablesInstalled) ? MF_CHECKED : MF_UNCHECKED));

+					if (!VariablesInstalled)

+						EnableMenuItem(hPopupMenu, IDM_SAM_OPTIONS_DISABLEVARIABLES, MF_BYCOMMAND | MF_GRAYED);

+

+					switch (TrackPopupMenu(hPopupMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD, (short)LOWORD(GetMessagePos()), (short)HIWORD(GetMessagePos()), 0, hwndDlg, NULL)) {

+					case IDM_SAM_OPTIONS_SHOWMSGTREE:

 						{

-							g_ContactSplitterX = MINSPLITTERPOS;

-							g_MsgSplitterX = MaxSplitterX;

-						} else

+							int bShow = !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE);

+							g_SetAwayMsgPage.SetValue(IDS_SAWAYMSG_SHOWMSGTREE, bShow);

+							RECT rcDlg;

+							GetWindowRect(hwndDlg, &rcDlg);

+							rcDlg.left -= bShow ? g_MsgSplitterX : -g_MsgSplitterX;

+							SendMessage(hwndDlg, WM_SIZING, WMSZ_LEFT, (LPARAM)&rcDlg);

+							SetWindowPos(hwndDlg, NULL, rcDlg.left, rcDlg.top, rcDlg.right - rcDlg.left, rcDlg.bottom - rcDlg.top, SWP_NOZORDER);

+							SendMessage(hwndDlg, WM_SIZE, 0, 0); // show/hide dialog controls accordingly

+						}

+						break;

+					case IDM_SAM_OPTIONS_SHOWCONTACTTREE:

 						{

-							g_ContactSplitterX = MINSPLITTERPOS + MaxSplitterX - g_MsgSplitterX;

+							int bShow = !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE);

+							if (bShow && !CList) {

+								NMCLIST nm;

+								nm.hdr.code = MCLN_SELCHANGED;

+								nm.hdr.hwndFrom = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

+								nm.hdr.idFrom = IDC_SAWAYMSG_CONTACTSTREE;

+								nm.OldSelection = CLSEL_DAT_CONTACT;

+								nm.NewSelection = CLSEL_DAT_NOTHING;

+								SendMessage(hwndDlg, WM_NOTIFY, 0, (LPARAM)&nm); // save current message

+								SendMessage(hwndDlg, UM_SAM_INITCLIST, 0, 0);

+							}

+							g_SetAwayMsgPage.SetValue(IDS_SAWAYMSG_SHOWCONTACTTREE, bShow);

+							RECT rcDlg;

+							GetWindowRect(hwndDlg, &rcDlg);

+							rcDlg.right += bShow ? g_ContactSplitterX : -g_ContactSplitterX;

+							SendMessage(hwndDlg, WM_SIZING, WMSZ_RIGHT, (LPARAM)&rcDlg);

+							SetWindowPos(hwndDlg, NULL, 0, 0, rcDlg.right - rcDlg.left, rcDlg.bottom - rcDlg.top, SWP_NOZORDER | SWP_NOMOVE);

+							SendMessage(hwndDlg, WM_SIZE, 0, 0); // show/hide dialog controls accordingly

 						}

+						break;

+					case IDM_SAM_OPTIONS_AUTOSAVEDLGSETTINGS:

+						g_SetAwayMsgPage.SetDBValue(IDS_SAWAYMSG_AUTOSAVEDLGSETTINGS, !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_AUTOSAVEDLGSETTINGS));

+						break;

+					case IDM_SAM_OPTIONS_SAVEDLGSETTINGSNOW:

+						SendMessage(hwndDlg, UM_SAM_SAVEDLGSETTINGS, 0, 0);

+						break;

+					case IDM_SAM_OPTIONS_DISABLEVARIABLES:

+						g_SetAwayMsgPage.SetDBValue(IDS_SAWAYMSG_DISABLEVARIABLES, !g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_DISABLEVARIABLES));

+						break;

 					}

-				} break;

-				case IDC_SAWAYMSG_CONTACTSPLITTER:

+					DestroyMenu(hMenu);

+				}

+				break;

+			case IDC_SAWAYMSG_SAVEMSG:

 				{

-					GetClientRect(hwndDlg, &rc);

-					pt.x = wParam;

-					pt.y = 0;

-					ScreenToClient(hwndDlg, &pt);

-					g_ContactSplitterX = (rc.right - pt.x < MINSPLITTERPOS) ? MINSPLITTERPOS : (rc.right - pt.x);

-					int MaxSetSplitterX = rc.right - MINSPLITTERPOS + 2;

-					int MaxSplitterX = MaxSetSplitterX;

-					if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE))

-					{

-						MaxSetSplitterX -= g_MsgSplitterX;

-						MaxSplitterX -= MINSPLITTERPOS;

-					}

-					if (g_ContactSplitterX > MaxSetSplitterX)

-					{

-						if (g_ContactSplitterX > MaxSplitterX)

-						{

-							g_MsgSplitterX = MINSPLITTERPOS;

-							g_ContactSplitterX = MaxSplitterX;

-						} else

-						{

-							g_MsgSplitterX = MINSPLITTERPOS + MaxSplitterX - g_ContactSplitterX;

+					CBaseTreeItem* TreeItem = MsgTree->GetSelection();

+					if (TreeItem && !(TreeItem->Flags & TIF_ROOTITEM)) {

+						MsgTree->EnsureVisible(TreeItem->hItem);

+						TCString NewMsg;

+						GetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, NewMsg.GetBuffer(AWAY_MSGDATA_MAX), AWAY_MSGDATA_MAX);

+						NewMsg.ReleaseBuffer();

+						if (((CTreeItem*)TreeItem)->User_Str1 != (const TCHAR*)NewMsg) {

+							((CTreeItem*)TreeItem)->User_Str1 = NewMsg;

+							MsgTree->SetModified(true);

 						}

 					}

-				} break;

+				}

+				break;

+			case IDC_SAWAYMSG_SAVEASNEW:

+				{

+					TCString Text;

+					GetDlgItemText(hwndDlg, IDC_SAWAYMSG_MSGDATA, Text.GetBuffer(AWAY_MSGDATA_MAX), AWAY_MSGDATA_MAX);

+					Text.ReleaseBuffer();

+					UpdateLock++;

+					CTreeItem* TreeItem = MsgTree->AddMessage();

+					UpdateLock--;

+					TreeItem->User_Str1 = Text;

+				}

+				break;

+			case IDC_SAWAYMSG_NEWCATEGORY:

+				MsgTree->AddCategory();

+				break;

+			case IDC_SAWAYMSG_DELETE:

+				MsgTree->EnsureVisible(MsgTree->GetSelection()->hItem);

+				MsgTree->DeleteSelectedItem();

+				break;

+			case IDC_SAWAYMSG_VARS:

+				my_variables_showhelp(hwndDlg, IDC_SAWAYMSG_MSGDATA);

+				break;

+			case IDC_OK:

+				// save OK button title before resetting it in SetSelContactsMessage

+				TCString BtnTitle;

+				GetDlgItemText(hwndDlg, IDC_OK, BtnTitle.GetBuffer(64), 64);

+				BtnTitle.ReleaseBuffer();

+				ApplySelContactsMessage(dat, CList);

+				if (BtnTitle != (const TCHAR*)TranslateT("Apply"))

+					SendMessage(hwndDlg, UM_SAM_APPLYANDCLOSE, 0, 0);

 			}

-			SetMsgSplitterX = g_MsgSplitterX;

-			SetContactSplitterX = g_ContactSplitterX;

-			SendMessage(hwndDlg, WM_SIZE, 0, 0);

-		} break;

-		case WM_SIZING:

+		}

+		break;

+

+	case UM_SAM_SPLITTERMOVED:

+		switch (lParam) {

+		RECT rc;

+		POINT pt;

+		int MaxSetSplitterX, MaxSplitterX;

+		case IDC_SAWAYMSG_MSGSPLITTER:

+			GetClientRect(hwndDlg, &rc);

+			pt.x = wParam;

+			pt.y = 0;

+			ScreenToClient(hwndDlg, &pt);

+			g_MsgSplitterX = (pt.x < MINSPLITTERPOS) ? MINSPLITTERPOS : pt.x;

+			MaxSetSplitterX = rc.right - MINSPLITTERPOS + 2;

+			MaxSplitterX = MaxSetSplitterX;

+			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE)) {

+				MaxSetSplitterX -= g_ContactSplitterX;

+				MaxSplitterX -= MINSPLITTERPOS;

+			}

+			if (g_MsgSplitterX > MaxSetSplitterX) {

+				if (g_MsgSplitterX > MaxSplitterX) {

+					g_ContactSplitterX = MINSPLITTERPOS;

+					g_MsgSplitterX = MaxSplitterX;

+				}

+				else g_ContactSplitterX = MINSPLITTERPOS + MaxSplitterX - g_MsgSplitterX;

+			}

+			break;

+

+		case IDC_SAWAYMSG_CONTACTSPLITTER:

+			GetClientRect(hwndDlg, &rc);

+			pt.x = wParam;

+			pt.y = 0;

+			ScreenToClient(hwndDlg, &pt);

+			g_ContactSplitterX = (rc.right - pt.x < MINSPLITTERPOS) ? MINSPLITTERPOS : (rc.right - pt.x);

+			MaxSetSplitterX = rc.right - MINSPLITTERPOS + 2;

+			MaxSplitterX = MaxSetSplitterX;

+			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE)) {

+				MaxSetSplitterX -= g_MsgSplitterX;

+				MaxSplitterX -= MINSPLITTERPOS;

+			}

+			if (g_ContactSplitterX > MaxSetSplitterX) {

+				if (g_ContactSplitterX > MaxSplitterX) {

+					g_MsgSplitterX = MINSPLITTERPOS;

+					g_ContactSplitterX = MaxSplitterX;

+				}

+				else g_MsgSplitterX = MINSPLITTERPOS + MaxSplitterX - g_ContactSplitterX;

+			}

+		}

+		SetMsgSplitterX = g_MsgSplitterX;

+		SetContactSplitterX = g_ContactSplitterX;

+		SendMessage(hwndDlg, WM_SIZE, 0, 0);

+		break;

+

+	case WM_SIZING:

 		{

 			RECT *prcDlg = (RECT*)lParam;

 			int MinSetXSize = MINSPLITTERPOS + 7;

 			int MinXSize = MinMsgEditSize + 7;

-			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE))

-			{

+			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWMSGTREE)) {

 				MinSetXSize += SetMsgSplitterX - 1;

 				MinXSize += MinMsgSplitterX - 1;

 			}

-			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE))

-			{

+			if (g_SetAwayMsgPage.GetValue(IDS_SAWAYMSG_SHOWCONTACTTREE)) {

 				MinSetXSize += SetContactSplitterX - 1;

 				MinXSize += MinContactSplitterX - 1;

 			}

-			if (prcDlg->right - prcDlg->left < MinXSize)

-			{

+			if (prcDlg->right - prcDlg->left < MinXSize) {

 				if (wParam != WMSZ_LEFT && wParam != WMSZ_TOPLEFT && wParam != WMSZ_BOTTOMLEFT)

-				{

 					prcDlg->right = prcDlg->left + MinXSize;

-				} else

-				{

+				else

 					prcDlg->left = prcDlg->right - MinXSize;

-				}

 			}

-			if (prcDlg->right - prcDlg->left < MinSetXSize)

-			{

+			if (prcDlg->right - prcDlg->left < MinSetXSize) {

 				int Delta = MinSetXSize - (prcDlg->right - prcDlg->left);

-				if (SetMsgSplitterX > MinMsgSplitterX)

-				{

+				if (SetMsgSplitterX > MinMsgSplitterX) {

 					int D2 = min(Delta, SetMsgSplitterX - MinMsgSplitterX);

 					g_MsgSplitterX = SetMsgSplitterX - D2;

 					Delta -= D2;

 				}

 				g_ContactSplitterX = SetContactSplitterX - Delta;

-			} else

-			{

+			}

+			else {

 				g_MsgSplitterX = SetMsgSplitterX;

 				g_ContactSplitterX = SetContactSplitterX;

 			}

-			if (prcDlg->bottom - prcDlg->top < MINYDLGSIZE)

-			{

-				if (wParam != WMSZ_TOP && wParam != WMSZ_TOPLEFT && wParam != WMSZ_TOPRIGHT)

-				{

+			if (prcDlg->bottom - prcDlg->top < MINYDLGSIZE) {

+				if (wParam != WMSZ_TOP && wParam != WMSZ_TOPLEFT && wParam != WMSZ_TOPRIGHT) {

 					prcDlg->bottom = prcDlg->top + MINYDLGSIZE;

-				} else

-				{

+				}

+				else {

 					prcDlg->top = prcDlg->bottom - MINYDLGSIZE;

 				}

 			}

-			return true;

-		} break;

-		case WM_SIZE:

+		}

+		return true;

+

+	case WM_SIZE:

 		{

-			UTILRESIZEDIALOG urd = {0};

-			urd.cbSize = sizeof(urd);

+			UTILRESIZEDIALOG urd = { sizeof(urd) };

 			urd.hInstance = g_hInstance;

 			urd.hwndDlg = hwndDlg;

 			urd.lParam = (LPARAM)&g_SetAwayMsgPage;

@@ -1612,32 +1340,22 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 				ShowWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_STATIC_IGNOREICON), bShow);

 				ShowWindow(GetDlgItem(hwndDlg, IDC_SAWAYMSG_STATIC_REPLYICON), bShow);

 			}

-			/*if (hWndStatusBar)

-			{

-				RECT rcStatus; GetWindowRect(hWndStatusBar, &rcStatus);

-				RECT rcClient; GetClientRect(hwndDlg, &rcClient);

-				SetWindowPos(hWndStatusBar, NULL, 0, rcClient.bottom-(rcStatus.bottom-rcStatus.top), rcClient.right, (rcStatus.bottom-rcStatus.top), SWP_NOZORDER);

-			}*/

-

-

 		} // go through

-		case UM_SAM_KILLTIMER:

-		case WM_LBUTTONDOWN:

-		case WM_MOUSEACTIVATE:

-		case WM_MOVING: // stops counting

-		{

-			if (Countdown != -1) // still counting

-			{

-				KillTimer(hwndDlg, SAM_TIMER_ID);

-				SetDlgItemText(hwndDlg, IDC_OK, TranslateT("OK"));

-				Countdown = -1;

-			}

-		} break;

-		case WM_SETCURSOR:

+	case UM_SAM_KILLTIMER:

+	case WM_LBUTTONDOWN:

+	case WM_MOUSEACTIVATE:

+	case WM_MOVING: // stops counting

+		if (Countdown != -1) { // still counting

+			KillTimer(hwndDlg, SAM_TIMER_ID);

+			SetDlgItemText(hwndDlg, IDC_OK, TranslateT("OK"));

+			Countdown = -1;

+		}

+		break;

+

+	case WM_SETCURSOR:

 		{

 			HWND hTreeView = GetDlgItem(hwndDlg, IDC_SAWAYMSG_CONTACTSTREE);

-			if ((HWND)wParam == hTreeView && LOWORD(lParam) == HTCLIENT)

-			{

+			if ((HWND)wParam == hTreeView && LOWORD(lParam) == HTCLIENT) {

 				_ASSERT(CList);

 				DWORD hitFlags;

 				POINT pt;

@@ -1646,53 +1364,41 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 				ScreenToClient(hTreeView, &pt);

 				CList->HitTest(&pt, &hitFlags);

 				HCURSOR hCursor = NULL;

-				if (hitFlags & (MCLCHT_ONITEM | MCLCHT_ONITEMEXTRA))

-				{

+				if (hitFlags & (MCLCHT_ONITEM | MCLCHT_ONITEMEXTRA)) {

 					SetClassLong(hTreeView, GCLP_HCURSOR, NULL);

 					hCursor = LoadCursor(NULL, IDC_HAND); // set mouse cursor to a hand when hovering over items or their extra images

-				} else

-				{

-					SetClassLong(hTreeView, GCLP_HCURSOR, (LONG)LoadCursor(NULL, IDC_ARROW));

 				}

+				else SetClassLong(hTreeView, GCLP_HCURSOR, (LONG)LoadCursor(NULL, IDC_ARROW));

+

 				if (!hCursor)

-				{

 					hCursor = LoadCursor(NULL, IDC_ARROW);

-				}

+

 				SetCursor(hCursor);

 				return true;

-			} else

-			{

-				SetClassLong(hTreeView, GCLP_HCURSOR, (LONG)LoadCursor(NULL, IDC_ARROW));

 			}

-		} break;

-		case WM_CLOSE:

-		{

-			KillTimer(hwndDlg, SAM_TIMER_ID);

-			if (dat->IsModeless)

-			{

-				DestroyWindow(hwndDlg);

-			} else

-			{

-				EndDialog(hwndDlg, 2);

-			}

-		} break;

-		case WM_DESTROY:

-		{

-			if (dat)

-			{

-				delete dat;

-			}

-			if (CList)

-			{

-				delete CList;

-				CList = NULL;

-			}

-			delete MsgTree;

-			MsgTree = NULL;

-			g_SetAwayMsgPage.SetWnd(NULL);

-			DestroyWindow(hWndTooltips);

-			return false;

-		} break;

+			else SetClassLong(hTreeView, GCLP_HCURSOR, (LONG)LoadCursor(NULL, IDC_ARROW));

+		}

+		break;

+

+	case WM_CLOSE:

+		KillTimer(hwndDlg, SAM_TIMER_ID);

+		if (dat->IsModeless)

+			DestroyWindow(hwndDlg);

+		else

+			EndDialog(hwndDlg, 2);

+		break;

+

+	case WM_DESTROY:

+		delete dat;

+		if (CList) {

+			delete CList;

+			CList = NULL;

+		}

+		delete MsgTree;

+		MsgTree = NULL;

+		g_SetAwayMsgPage.SetWnd(NULL);

+		DestroyWindow(hWndTooltips);

+		return false;

 	}

 	return false;

 }