- scriver to open metacontact window upon receiving an event

- code cleaning

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

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp
index 8346294b40..bb8274587b 100644
--- a/plugins/Scriver/src/chat/log.cpp
+++ b/plugins/Scriver/src/chat/log.cpp
@@ -139,7 +139,7 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedra
 

 	// do we need to restore the selection

 	if (oldsel.cpMax != oldsel.cpMin) {

-		SendMessage(hwndRich, EM_EXSETSEL, 0, (LPARAM)& oldsel);

+		SendMessage(hwndRich, EM_EXSETSEL, 0, (LPARAM)&oldsel);

 		SendMessage(hwndRich, WM_SETREDRAW, TRUE, 0);

 		InvalidateRect(hwndRich, NULL, TRUE);

 	}

@@ -147,7 +147,7 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedra
 	// need to invalidate the window

 	if (bFlag) {

 		sel.cpMin = sel.cpMax = GetRichTextLength(hwndRich, CP_ACP, FALSE);

-		SendMessage(hwndRich, EM_EXSETSEL, 0, (LPARAM)& sel);

+		SendMessage(hwndRich, EM_EXSETSEL, 0, (LPARAM)&sel);

 		SendMessage(hwndRich, WM_SETREDRAW, TRUE, 0);

 		InvalidateRect(hwndRich, NULL, TRUE);

 	}

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 9f4b27a16b..a383b869f3 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -664,7 +664,7 @@ static LRESULT CALLBACK LogSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
 			if (sel.cpMin != sel.cpMax) {

 				SendMessage(hwnd, WM_COPY, 0, 0);

 				sel.cpMin = sel.cpMax;

-				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)& sel);

+				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);

 			}

 			SetFocus(GetDlgItem(GetParent(hwnd), IDC_CHAT_MESSAGE));

 		}

@@ -676,7 +676,7 @@ static LRESULT CALLBACK LogSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
 			SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);

 			if (sel.cpMin != sel.cpMax) {

 				sel.cpMin = sel.cpMax;

-				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)& sel);

+				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);

 			}

 		}

 		break;

@@ -710,10 +710,10 @@ static LRESULT CALLBACK LogSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
 				break;

 

 			case ID_COPYALL:

-				SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)& sel);

-				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)& all);

+				SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);

+				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&all);

 				SendMessage(hwnd, WM_COPY, 0, 0);

-				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)& sel);

+				SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);

 				PostMessage(GetParent(hwnd), WM_MOUSEACTIVATE, 0, 0);

 				break;

 

@@ -1095,7 +1095,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_SETEVENTMASK, 0, mask | ENM_LINK | ENM_MOUSEEVENTS);

 			SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_CHANGE | ENM_REQUESTRESIZE);

 			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_LIMITTEXT, (WPARAM)sizeof(TCHAR)* 0x7FFFFFFF, 0);

-			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_SETOLECALLBACK, 0, (LPARAM)& reOleCallback);

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_SETOLECALLBACK, 0, (LPARAM)&reOleCallback);

 

 			if (db_get_b(NULL, CHAT_MODULE, "UseIEView", 0)) {

 				IEVIEWWINDOW ieWindow = { sizeof(ieWindow) };

@@ -1609,7 +1609,7 @@ LABEL_SHOWWINDOW:
 				si.nPos = si.nMax - si.nPage + 1;

 				SetScrollInfo(GetDlgItem(hwndDlg, IDC_CHAT_LOG), SB_VERT, &si, TRUE);

 				sel.cpMin = sel.cpMax = GetRichTextLength(GetDlgItem(hwndDlg, IDC_CHAT_LOG), CP_ACP, FALSE);

-				SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LOG), EM_EXSETSEL, 0, (LPARAM)& sel);

+				SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_LOG), EM_EXSETSEL, 0, (LPARAM)&sel);

 				PostMessage(GetDlgItem(hwndDlg, IDC_CHAT_LOG), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);

 			}

 		}