From 77cafc3eb6fd925d6c10e84bf950ed9efb4c709a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 27 Jan 2014 16:16:40 +0000
Subject: special color for status change events in tabSRMM restored
git-svn-id: http://svn.miranda-ng.org/main/trunk@7917 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/TabSRMM/src/globals.cpp | 2 +-
plugins/TabSRMM/src/msgdlgutils.cpp | 1 +
plugins/TabSRMM/src/msglog.cpp | 3 ++-
plugins/TabSRMM/src/msgs.h | 1 +
plugins/TabSRMM/src/templates.cpp | 3 ++-
plugins/TabSRMM/src/version.h | 2 +-
6 files changed, 8 insertions(+), 4 deletions(-)
(limited to 'plugins')
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index a88a9d6e19..7367d25c03 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -659,7 +659,7 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
dbei.pBlob = (PBYTE)(char*)szMsg;
dbei.cbBlob = lstrlenA(szMsg) + 1;
dbei.flags = DBEF_UTF | DBEF_READ;
- dbei.eventType = EVENTTYPE_MESSAGE;
+ dbei.eventType = EVENTTYPE_STATUSCHANGE;
dbei.timestamp = time(NULL);
dbei.szModule = const_cast<char *>(c->getProto());
StreamInEvents(dat->hwnd, NULL, 1, 1, &dbei);
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 11334d4665..d8bf4baa15 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -41,6 +41,7 @@
#define EVENTTYPE_JABBER_PRESENCE 2001
static int g_status_events[] = {
+ EVENTTYPE_STATUSCHANGE,
EVENTTYPE_CONTACTLEFTCHANNEL,
EVENTTYPE_WAT_ANSWER,
EVENTTYPE_JABBER_CHATSTATES,
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index eb1afae46e..989d1daf69 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -974,11 +974,12 @@ static char *Template_CreateRTFFromDbEvent(TWindowData *dat, HANDLE hContact, HA
break;
case 'M': // message
if (bIsStatusChangeEvent)
- dbei.eventType = EVENTTYPE_MESSAGE;
+ dbei.eventType = EVENTTYPE_STATUSCHANGE;
switch (dbei.eventType) {
case EVENTTYPE_MESSAGE:
case EVENTTYPE_ERRMSG:
+ case EVENTTYPE_STATUSCHANGE:
if (bIsStatusChangeEvent || dbei.eventType == EVENTTYPE_ERRMSG) {
if (dbei.eventType == EVENTTYPE_ERRMSG && dbei.cbBlob == 0)
break;
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 205c8cb9f5..b6a3ace22d 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -764,6 +764,7 @@ private:
#define IDM_CONTAINERMENU 50500
+#define EVENTTYPE_STATUSCHANGE 25368
#define EVENTTYPE_DIVIDER 25367
#define EVENTTYPE_ERRMSG 25366
diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp
index 9d883d6e09..a2584bebe2 100644
--- a/plugins/TabSRMM/src/templates.cpp
+++ b/plugins/TabSRMM/src/templates.cpp
@@ -352,7 +352,8 @@ INT_PTR CALLBACK DlgProcTemplateEditor(HWND hwndDlg, UINT msg, WPARAM wParam, LP
}
dbei.szModule = dat->szProto;
dbei.timestamp = time(NULL);
- dbei.eventType = (iIndex == 7) ? EVENTTYPE_ERRMSG : EVENTTYPE_MESSAGE;
+ dbei.eventType = (iIndex == 6) ? EVENTTYPE_STATUSCHANGE : EVENTTYPE_MESSAGE;
+ dbei.eventType = (iIndex == 7) ? EVENTTYPE_ERRMSG : dbei.eventType;
if (dbei.eventType == EVENTTYPE_ERRMSG)
dbei.szModule = "Sample error message";
dbei.cbSize = sizeof(dbei);
diff --git a/plugins/TabSRMM/src/version.h b/plugins/TabSRMM/src/version.h
index 2f210242c8..744749d81b 100644
--- a/plugins/TabSRMM/src/version.h
+++ b/plugins/TabSRMM/src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 3
#define __MINOR_VERSION 3
#define __RELEASE_NUM 0
-#define __BUILD_NUM 1
+#define __BUILD_NUM 2
#include <stdver.h>
--
cgit v1.2.3