From 0ead8bc26f63385a8ee1cba53fb857d32dcd3567 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Wed, 9 Apr 2008 06:58:57 +0000
Subject: secure IM patch by baloo

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@404 4f64403b-2f21-0410-a795-97e2b3489a10
---
 metacontacts/MetaContacts.mdsp | 2 +-
 metacontacts/meta_services.c   | 4 ++--
 metacontacts/version.h         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'metacontacts')

diff --git a/metacontacts/MetaContacts.mdsp b/metacontacts/MetaContacts.mdsp
index 5cc8303..54204c5 100644
--- a/metacontacts/MetaContacts.mdsp
+++ b/metacontacts/MetaContacts.mdsp
@@ -99,4 +99,4 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
-meta_options.c,24359
+meta_options.c,25290
diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c
index 3ff39e2..cf42ef2 100644
--- a/metacontacts/meta_services.c
+++ b/metacontacts/meta_services.c
@@ -384,7 +384,7 @@ int Meta_SendMessage(WPARAM wParam,LPARAM lParam)
 				strncpy(szServiceName, PSS_MESSAGE "W", sizeof(szServiceName)); 
 		}
 
-		if(options.subhistory) {
+		if(options.subhistory && !(ccs->wParam & PREF_METANODB)) {
 			// add sent event to subcontact
 			ZeroMemory(&dbei, sizeof(dbei));
 			dbei.cbSize = sizeof(dbei);
@@ -544,7 +544,7 @@ int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 		ccs->hContact = hSub;
 	}
 
-	if(options.subhistory) {
+	if(options.subhistory && !(ccs->wParam & PREF_METANODB)) {
 		// allow event pass through and thereby be added to subcontact history
 		pre->flags |= (DBGetContactSettingByte(ccs->hContact, META_PROTO, "WindowOpen", 0) ? 0 : PREF_CREATEREAD);
 		CallService(MS_PROTO_CHAINRECV, wParam, (LPARAM)ccs);		// pass through as normal
diff --git a/metacontacts/version.h b/metacontacts/version.h
index a7643ce..7b37f33 100644
--- a/metacontacts/version.h
+++ b/metacontacts/version.h
@@ -5,7 +5,7 @@
 #define __MAJOR_VERSION				0
 #define __MINOR_VERSION				14
 #define __RELEASE_NUM				0
-#define __BUILD_NUM					6
+#define __BUILD_NUM					7
 
 #define __FILEVERSION_STRING        __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
 #define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-- 
cgit v1.2.3