status displaying completely removed because it's impossible to log an event from memory

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

8 files changed, 127 insertions, 178 deletions

diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc
index 7aaf0333c2..ce5af4cd93 100644
--- a/plugins/Scriver/res/resource.rc
+++ b/plugins/Scriver/res/resource.rc
@@ -134,10 +134,8 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg"

 BEGIN

     GROUPBOX        "Message Window Event Log",IDC_STMSGLOGGROUP,0,0,304,181

-	CONTROL         "Enable IEView",IDC_USEIEVIEW,"Button",BS_AUTOCHECKBOX | BS_FLAT |

+	 CONTROL         "Enable IEView", IDC_USEIEVIEW, "Button", BS_AUTOCHECKBOX | BS_FLAT |

 					WS_TABSTOP,8,12,140,10

-    CONTROL         "Log status changes",IDC_SHOWSTATUSCHANGES,"Button",

-					BS_AUTOCHECKBOX | WS_TABSTOP,160,12,140,10

     CONTROL         "Show icons",IDC_SHOWLOGICONS,"Button",BS_AUTOCHECKBOX |

 					WS_TABSTOP,8,25,140,10

     CONTROL         "Show time",IDC_SHOWTIMES,"Button",BS_AUTOCHECKBOX |

diff --git a/plugins/Scriver/src/Version.h b/plugins/Scriver/src/Version.h
index ba732991a9..3f1910d128 100644
--- a/plugins/Scriver/src/Version.h
+++ b/plugins/Scriver/src/Version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION				2

 #define __MINOR_VERSION				10

-#define __RELEASE_NUM				0

-#define __BUILD_NUM					2

+#define __RELEASE_NUM				1

+#define __BUILD_NUM					0

 

 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 

diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h
index 246ccb6d3f..3f4ebf43e2 100644
--- a/plugins/Scriver/src/commonheaders.h
+++ b/plugins/Scriver/src/commonheaders.h
@@ -64,6 +64,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_hotkeys.h>

 #include <m_popup.h>

 #include <m_timezones.h>

+#include <m_string.h>

 #include <m_xstatus.h>

 #include <win2k.h>

 

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 9b5d81c86c..42e3ca6ec6 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1105,43 +1105,9 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				mir_snprintf(buf, sizeof(buf), Translate("User Menu - %s"), idbuf);

 				SendMessage(GetDlgItem(hwndDlg, IDC_USERMENU), BUTTONADDTOOLTIP, (WPARAM) buf, 0);

 

-				if (!cws || (!strcmp(cws->szModule, dat->szProto) && !strcmp(cws->szSetting, "Status"))) {

-					DWORD wStatus;

-					wStatus = db_get_w( dat->windowData.hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);

-					// log status change - should be moved to a separate place

-					if (dat->wStatus != wStatus && db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH)) {

-						ptrT szOldStatus( mir_tstrdup( pcli->pfnGetStatusModeDescription(dat->wStatus, 0)));

-						ptrT szNewStatus( mir_tstrdup( pcli->pfnGetStatusModeDescription(wStatus, 0)));

-

-						int iLen;

-						TCHAR buffer[512];

-						if (wStatus == ID_STATUS_OFFLINE) {

-							iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("signed off (was %s)"), szOldStatus);

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

-						}

-						else if (dat->wStatus == ID_STATUS_OFFLINE)

-							iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("signed on (%s)"), szNewStatus);

-						else

-							iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("is now %s (was %s)"), szNewStatus, szOldStatus);

-

-						char blob[2048];

-						int ansiLen = WideCharToMultiByte(CP_ACP, 0, buffer, -1, blob, sizeof(blob), 0, 0);

-						memcpy(blob+ansiLen, buffer, sizeof(TCHAR)*(iLen+1));

+				if (!cws || (!strcmp(cws->szModule, dat->szProto) && !strcmp(cws->szSetting, "Status")))

+					dat->wStatus = cws->value.wVal;

 

-						DBEVENTINFO dbei = { sizeof(dbei) };

-						dbei.cbBlob = ansiLen + sizeof(TCHAR)*(iLen+1);

-						dbei.pBlob = (PBYTE)blob;

-						dbei.eventType = EVENTTYPE_STATUSCHANGE;

-						dbei.timestamp = time(NULL);

-						dbei.szModule = dat->szProto;

-						HANDLE hNewEvent = db_event_add(dat->windowData.hContact, &dbei);

-						if (dat->hDbEventFirst == NULL) {

-							dat->hDbEventFirst = hNewEvent;

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

-						}

-					}

-					dat->wStatus = wStatus;

-				}

 				SetStatusIcon(dat);

 				SendMessage(hwndDlg, DM_UPDATEICON, 0, 0);

 				SendMessage(hwndDlg, DM_UPDATETITLEBAR, 0, 0);

@@ -1452,7 +1418,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					SendMessage(hwndDlg, DM_APPENDTOLOG, WPARAM(hDbEvent), 0);

 				else

 					SendMessage(hwndDlg, DM_REMAKELOG, 0, 0);

-				if (!(dbei.flags & DBEF_SENT) && dbei.eventType != EVENTTYPE_STATUSCHANGE && dbei.eventType != EVENTTYPE_JABBER_CHATSTATES && dbei.eventType != EVENTTYPE_JABBER_PRESENCE) {

+				if (!(dbei.flags & DBEF_SENT) && dbei.eventType != EVENTTYPE_JABBER_CHATSTATES && dbei.eventType != EVENTTYPE_JABBER_PRESENCE) {

 					if (GetActiveWindow() != dat->hwndParent || GetForegroundWindow() != dat->hwndParent || dat->parent->hwndActive != hwndDlg) {

 						dat->showUnread = 1;

 						SendMessage(hwndDlg, DM_UPDATEICON, 0, 0);

@@ -1849,11 +1815,11 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						break;

 					dbei.pBlob = (PBYTE) mir_alloc(dbei.cbBlob);

 					db_event_get(dat->hDbEventLast, &dbei);

-					if (DbEventIsMessageOrCustom(&dbei) || dbei.eventType == EVENTTYPE_STATUSCHANGE) {

-						TCHAR *buffer = DbGetEventTextT( &dbei, CP_ACP );

-						if (buffer!=NULL) {

+					if (DbEventIsMessageOrCustom(&dbei)) {

+						TCHAR *buffer = DbGetEventTextT(&dbei, CP_ACP);

+						if (buffer != NULL) {

 							TCHAR *quotedBuffer = GetQuotedTextW(buffer);

-							SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_SETTEXTEX, (WPARAM) &st, (LPARAM)quotedBuffer);

+							SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer);

 							mir_free(quotedBuffer);

 							mir_free(buffer);

 						}

diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index d36c982b8e..bb34675d3f 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -139,12 +139,9 @@ int DbEventIsShown(DBEVENTINFO * dbei, struct SrmmWindowData *dat)
 	case EVENTTYPE_MESSAGE:

 		return 1;

 

-	case EVENTTYPE_STATUSCHANGE:

 	case EVENTTYPE_JABBER_CHATSTATES:

 	case EVENTTYPE_JABBER_PRESENCE:

-		if (!db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH))

-			return 0;

-		return 1;

+		return 0;

 

 	case EVENTTYPE_FILE:

 	case EVENTTYPE_URL:

@@ -173,10 +170,9 @@ EventData *getEventFromDB(struct SrmmWindowData *dat, HANDLE hContact, HANDLE hD
 		db_event_markRead(hContact, hDbEvent);

 		CallService(MS_CLIST_REMOVEEVENT, (WPARAM) hContact, (LPARAM)hDbEvent);

 	}

-	else if (dbei.eventType == EVENTTYPE_STATUSCHANGE || dbei.eventType == EVENTTYPE_JABBER_CHATSTATES ||

-		dbei.eventType == EVENTTYPE_JABBER_PRESENCE) {

+	else if (dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE)

 		db_event_markRead(hContact, hDbEvent);

-	}

+

 	evt->eventType = evt->custom ? EVENTTYPE_MESSAGE : dbei.eventType;

 	evt->dwFlags = (dbei.flags & DBEF_READ ? IEEDF_READ : 0) | (dbei.flags & DBEF_SENT ? IEEDF_SENT : 0) | (dbei.flags & DBEF_RTL ? IEEDF_RTL : 0);

 	evt->dwFlags |= IEEDF_UNICODE_TEXT | IEEDF_UNICODE_NICK | IEEDF_UNICODE_TEXT2;

@@ -649,7 +645,6 @@ static char *CreateRTFFromEvent(struct SrmmWindowData *dat, EventData *evt, stru
 

 		case EVENTTYPE_JABBER_CHATSTATES:

 		case EVENTTYPE_JABBER_PRESENCE:

-		case EVENTTYPE_STATUSCHANGE:

 		case EVENTTYPE_URL:

 		case EVENTTYPE_FILE:

 			i = LOGICON_MSG_NOTICE;

@@ -688,7 +683,7 @@ static char *CreateRTFFromEvent(struct SrmmWindowData *dat, EventData *evt, stru
 			AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "%s: ", SetToStyle(evt->dwFlags & IEEDF_SENT ? MSGFONTID_MYCOLON : MSGFONTID_YOURCOLON));

 		showColon = 1;

 	}

-	if ((!(gdat->flags&SMF_HIDENAMES) && evt->eventType == EVENTTYPE_MESSAGE && isGroupBreak) || evt->eventType == EVENTTYPE_STATUSCHANGE || evt->eventType == EVENTTYPE_JABBER_CHATSTATES || evt->eventType == EVENTTYPE_JABBER_PRESENCE) {

+	if ((!(gdat->flags & SMF_HIDENAMES) && evt->eventType == EVENTTYPE_MESSAGE && isGroupBreak) || evt->eventType == EVENTTYPE_JABBER_CHATSTATES || evt->eventType == EVENTTYPE_JABBER_PRESENCE) {

 		if (evt->eventType == EVENTTYPE_MESSAGE) {

 			if (showColon)

 				AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, " %s ", SetToStyle(evt->dwFlags & IEEDF_SENT ? MSGFONTID_MYNAME : MSGFONTID_YOURNAME));

@@ -734,7 +729,6 @@ static char *CreateRTFFromEvent(struct SrmmWindowData *dat, EventData *evt, stru
 

 	case EVENTTYPE_JABBER_CHATSTATES:

 	case EVENTTYPE_JABBER_PRESENCE:

-	case EVENTTYPE_STATUSCHANGE:

 	case EVENTTYPE_URL:

 	case EVENTTYPE_FILE:

 		style = MSGFONTID_NOTICE;

@@ -755,10 +749,12 @@ static char *CreateRTFFromEvent(struct SrmmWindowData *dat, EventData *evt, stru
 		}

 		AppendTToBuffer(&buffer, &bufferEnd, &bufferAlloced, _T(" "));

 

-		if (evt->dwFlags & IEEDF_UNICODE_TEXT)

-			AppendUnicodeToBuffer(&buffer, &bufferEnd, &bufferAlloced, evt->pszTextW);

-		else

-			AppendAnsiToBuffer(&buffer, &bufferEnd, &bufferAlloced, evt->pszText);

+		if (evt->pszTextW != NULL) {

+			if (evt->dwFlags & IEEDF_UNICODE_TEXT)

+				AppendUnicodeToBuffer(&buffer, &bufferEnd, &bufferAlloced, evt->pszTextW);

+			else

+				AppendAnsiToBuffer(&buffer, &bufferEnd, &bufferAlloced, evt->pszText);

+		}

 

 		if (evt->pszText2W != NULL) {

 			AppendTToBuffer(&buffer, &bufferEnd, &bufferAlloced, _T(" ("));

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 4c638b552b..d0a6fa9f76 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -795,8 +795,6 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_SETRANGE, 0, MAKELONG(999, 0));

 		SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_SETPOS, 0, db_get_w(NULL, SRMMMOD, SRMSGSET_INDENTSIZE, SRMSGDEFSET_INDENTSIZE));

 

-		CheckDlgButton(hwndDlg, IDC_SHOWSTATUSCHANGES, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH));

-

 		SendDlgItemMessage(hwndDlg, IDC_LINECOLOUR, CPM_SETCOLOUR, 0, db_get_dw(NULL, SRMMMOD, SRMSGSET_LINECOLOUR, SRMSGDEFSET_LINECOLOUR));

 		{

 			PARAFORMAT2 pf2;

@@ -807,8 +805,8 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 			pf2.dxRightIndent = 30;

 			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETPARAFORMAT, 0, (LPARAM)&pf2);

 			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);

-			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0));

-			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_AUTOURLDETECT, (WPARAM) TRUE, 0);

+			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0));

+			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_AUTOURLDETECT, (WPARAM)TRUE, 0);

 			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETOLECALLBACK, 0, (LPARAM)& reOleCallback);

 		}

 		ShowPreview(hwndDlg);

@@ -864,13 +862,13 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 			ShowPreview(hwndDlg);

 			break;

 		case IDC_INDENTSIZE:

-			if (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())

+			if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

 				return TRUE;

 			ShowPreview(hwndDlg);

 			break;

 		case IDC_LOADCOUNTN:

 		case IDC_LOADTIMEN:

-			if (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())

+			if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

 				return TRUE;

 			break;

 		}

@@ -878,9 +876,9 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 		break;

 

 	case WM_NOTIFY:

-		switch (((LPNMHDR) lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

-			switch (((LPNMHDR) lParam)->code) {

+			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

 				if (IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT))

 					db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_COUNT);

@@ -888,24 +886,23 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 					db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_TIME);

 				else

 					db_set_b(NULL, SRMMMOD, SRMSGSET_LOADHISTORY, LOADHISTORY_UNREAD);

-				db_set_w(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, (WORD) SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_GETPOS, 0, 0));

-				db_set_w(NULL, SRMMMOD, SRMSGSET_LOADTIME, (WORD) SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_GETPOS, 0, 0));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWLOGICONS));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_HIDENAMES, (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_SHOWNAMES));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTIME, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWSECONDS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSECONDS));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWDATE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWDATES));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_USELONGDATE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_USELONGDATE));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_USERELATIVEDATE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_USERELATIVEDATE));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUSCHANGES));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_GROUPMESSAGES, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_GROUPMESSAGES));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_MARKFOLLOWUPS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_MARKFOLLOWUPS));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_MESSAGEONNEWLINE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_MESSAGEONNEWLINE));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_DRAWLINES, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DRAWLINES));

+				db_set_w(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, (WORD)SendDlgItemMessage(hwndDlg, IDC_LOADCOUNTSPIN, UDM_GETPOS, 0, 0));

+				db_set_w(NULL, SRMMMOD, SRMSGSET_LOADTIME, (WORD)SendDlgItemMessage(hwndDlg, IDC_LOADTIMESPIN, UDM_GETPOS, 0, 0));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWLOGICONS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_HIDENAMES, (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_SHOWNAMES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTIME, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWSECONDS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSECONDS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWDATE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWDATES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_USELONGDATE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_USELONGDATE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_USERELATIVEDATE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_USERELATIVEDATE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_GROUPMESSAGES, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_GROUPMESSAGES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_MARKFOLLOWUPS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MARKFOLLOWUPS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_MESSAGEONNEWLINE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MESSAGEONNEWLINE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_DRAWLINES, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DRAWLINES));

 				db_set_dw(NULL, SRMMMOD, SRMSGSET_LINECOLOUR, SendDlgItemMessage(hwndDlg, IDC_LINECOLOUR, CPM_GETCOLOUR, 0, 0));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_USEIEVIEW, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_USEIEVIEW));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_INDENTTEXT, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_INDENTTEXT));

-				db_set_w(NULL, SRMMMOD, SRMSGSET_INDENTSIZE, (WORD) SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_GETPOS, 0, 0));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_USEIEVIEW, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_USEIEVIEW));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_INDENTTEXT, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_INDENTTEXT));

+				db_set_w(NULL, SRMMMOD, SRMSGSET_INDENTSIZE, (WORD)SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_GETPOS, 0, 0));

 

 				FreeMsgLogIcons();

 				LoadMsgLogIcons();

@@ -921,19 +918,17 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 

 static void ResetCList(HWND hwndDlg)

 {

-	int i;

-

 	if (CallService(MS_CLUI_GETCAPS, 0, 0) & CLUIF_DISABLEGROUPS && !db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT))

-		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM) FALSE, 0);

+		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM)FALSE, 0);

 	else

-		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM) TRUE, 0);

+		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM)TRUE, 0);

 	SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0);

 	SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETGREYOUTFLAGS, 0, 0);

 	SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETLEFTMARGIN, 2, 0);

 	SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETBKBITMAP, 0, (LPARAM)(HBITMAP) NULL);

 	SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0);

 	SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETINDENT, 10, 0);

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

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

 		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT));

 }

 

@@ -973,98 +968,95 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 	static HANDLE hItemNew, hItemUnknown;

 

 	switch (msg) {

-		case WM_INITDIALOG:

-			TranslateDialogDefault(hwndDlg);

-			{

-				CLCINFOITEM cii = { 0 };

-				cii.cbSize = sizeof(cii);

-				cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX;

-				cii.pszText = (TCHAR *)TranslateT("** New contacts **");

-				hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);

-				cii.pszText = (TCHAR *)TranslateT("** Unknown contacts **");

-				hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

+		{

+			CLCINFOITEM cii = { sizeof(cii) };

+			cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX;

+			cii.pszText = (TCHAR *)TranslateT("** New contacts **");

+			hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);

+			cii.pszText = (TCHAR *)TranslateT("** Unknown contacts **");

+			hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);

+		}

+		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | (CLS_SHOWHIDDEN) | (CLS_NOHIDEOFFLINE));

+		ResetCList(hwndDlg);

+		RebuildList(hwndDlg, hItemNew, hItemUnknown);

+		CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING));

+		CheckDlgButton(hwndDlg, IDC_TYPEWIN, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, SRMSGDEFSET_SHOWTYPINGWIN));

+		CheckDlgButton(hwndDlg, IDC_TYPETRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, SRMSGDEFSET_SHOWTYPINGNOWIN));

+		CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

+		CheckDlgButton(hwndDlg, IDC_NOTIFYBALLOON, !db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

+		CheckDlgButton(hwndDlg, IDC_TYPINGSWITCH, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGSWITCH, SRMSGDEFSET_SHOWTYPINGSWITCH));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

+		if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

+			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), FALSE);

+			CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, BST_CHECKED);

+			SetWindowText(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TranslateT("Show balloon popup (unsupported system)"));

+		}

+		break;

+	case WM_COMMAND:

+		switch (LOWORD(wParam)) {

+		case IDC_TYPETRAY:

+			if (IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY)) {

+				if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

+					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

+				}

+				else {

+					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

+					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TRUE);

+				}

 			}

-			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | (CLS_SHOWHIDDEN) | (CLS_NOHIDEOFFLINE));

-			ResetCList(hwndDlg);

-			RebuildList(hwndDlg, hItemNew, hItemUnknown);

-			CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING));

-			CheckDlgButton(hwndDlg, IDC_TYPEWIN, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, SRMSGDEFSET_SHOWTYPINGWIN));

-			CheckDlgButton(hwndDlg, IDC_TYPETRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, SRMSGDEFSET_SHOWTYPINGNOWIN));

-			CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

-			CheckDlgButton(hwndDlg, IDC_NOTIFYBALLOON, !db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST));

-			CheckDlgButton(hwndDlg, IDC_TYPINGSWITCH, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGSWITCH, SRMSGDEFSET_SHOWTYPINGSWITCH));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

-			if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

+			else {

+				EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), FALSE);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), FALSE);

-				CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, BST_CHECKED);

-				SetWindowText(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TranslateT("Show balloon popup (unsupported system)"));

 			}

+			MarkChanges(4, hwndDlg);

 			break;

-		case WM_COMMAND:

-			switch (LOWORD(wParam)) {

-				case IDC_TYPETRAY:

-					if (IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY)) {

-						if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

-							EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

-						}

-						else {

-							EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), TRUE);

-							EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TRUE);

-						}

-					}

-					else {

-						EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), FALSE);

-						EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), FALSE);

-					}

-					MarkChanges(4, hwndDlg);

-					break;

-				case IDC_SHOWNOTIFY:

-					EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-					EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY)

-								 && ServiceExists(MS_CLIST_SYSTRAY_NOTIFY));

-					//fall-thru

-				case IDC_TYPEWIN:

-				case IDC_NOTIFYTRAY:

-				case IDC_NOTIFYBALLOON:

-				case IDC_TYPINGSWITCH:

-					MarkChanges(4, hwndDlg);

-					break;

+		case IDC_SHOWNOTIFY:

+			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY)

+				&& ServiceExists(MS_CLIST_SYSTRAY_NOTIFY));

+			//fall-thru

+		case IDC_TYPEWIN:

+		case IDC_NOTIFYTRAY:

+		case IDC_NOTIFYBALLOON:

+		case IDC_TYPINGSWITCH:

+			MarkChanges(4, hwndDlg);

+			break;

+		}

+		break;

+	case WM_NOTIFY:

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

+		case IDC_CLIST:

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

+			case CLN_OPTIONSCHANGED:

+				ResetCList(hwndDlg);

+				break;

+			case CLN_CHECKCHANGED:

+				MarkChanges(4, hwndDlg);

+				break;

 			}

 			break;

-		case WM_NOTIFY:

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

-				case IDC_CLIST:

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

-						case CLN_OPTIONSCHANGED:

-							ResetCList(hwndDlg);

-							break;

-						case CLN_CHECKCHANGED:

-							MarkChanges(4, hwndDlg);

-							break;

-					}

-					break;

-				case 0:

-					switch (((LPNMHDR) lParam)->code) {

-						case PSN_APPLY:

-						{

-							SaveList(hwndDlg, hItemNew, hItemUnknown);

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TYPEWIN));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_NOTIFYTRAY));

-							db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGSWITCH, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TYPINGSWITCH));

-							ReloadGlobals();

-							WindowList_Broadcast(g_dat.hMessageWindowList, DM_OPTIONSAPPLIED, 0, 0);

-						}

-					}

-					break;

+		case 0:

+			switch (((LPNMHDR)lParam)->code) {

+			case PSN_APPLY:

+				SaveList(hwndDlg, hItemNew, hItemUnknown);

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGWIN, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TYPEWIN));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGNOWIN, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGCLIST, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_NOTIFYTRAY));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPINGSWITCH, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TYPINGSWITCH));

+				ReloadGlobals();

+				WindowList_Broadcast(g_dat.hMessageWindowList, DM_OPTIONSAPPLIED, 0, 0);

 			}

 			break;

+		}

+		break;

 	}

 	return FALSE;

 }

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index db6cec558f..74004a7a91 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -193,7 +193,6 @@ struct SrmmWindowData
 

 #define EVENTTYPE_JABBER_CHATSTATES     2000

 #define EVENTTYPE_JABBER_PRESENCE       2001

-#define EVENTTYPE_STATUSCHANGE          25368

 

 struct CREOleCallback : public IRichEditOleCallback

 {

@@ -372,8 +371,6 @@ extern int fontOptionsListSize;
 #define SRMSGDEFSET_SHOWTIME		1

 #define SRMSGSET_SHOWDATE			"ShowDate"

 #define SRMSGDEFSET_SHOWDATE		0

-#define SRMSGSET_SHOWSTATUSCH		"ShowStatusChanges"

-#define SRMSGDEFSET_SHOWSTATUSCH	1

 #define SRMSGSET_BKGCOLOUR				"BkgColour"

 #define SRMSGDEFSET_BKGCOLOUR			GetSysColor(COLOR_WINDOW)

 #define SRMSGSET_INPUTBKGCOLOUR			"InputBkgColour"

diff --git a/plugins/Scriver/src/resource.h b/plugins/Scriver/src/resource.h
index bfe2a0a7ac..4ec3aabdf2 100644
--- a/plugins/Scriver/src/resource.h
+++ b/plugins/Scriver/src/resource.h
@@ -102,7 +102,6 @@
 #define IDC_SHOWTIMES                   1033

 #define IDC_SHOWDATES                   1034

 #define IDC_CLIST                       1035

-#define IDC_SHOWSTATUSCHANGES           1035

 #define IDC_GROUPMESSAGES               1036

 #define IDC_SAVEPERCONTACT              1037

 #define IDC_LOADCOUNTN                  1039