summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2006-11-02 01:14:51 +0000
committersje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2006-11-02 01:14:51 +0000
commit4899f699f732c5da6699c08a7060bc1831eb1986 (patch)
treeaa85c48bbe5c3d6173a4fc4da0f7b1af3777ee44
parentfe38b9ac56adbe22606c01c54e37dbb06212c07c (diff)
fix for duplicate messages when 'use subcontact windows' is enabled
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@28 4f64403b-2f21-0410-a795-97e2b3489a10
-rw-r--r--metacontacts/meta_services.c3
-rw-r--r--metacontacts/version.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c
index 8bd17ad..174b625 100644
--- a/metacontacts/meta_services.c
+++ b/metacontacts/meta_services.c
@@ -447,11 +447,14 @@ int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
if(proto) {
char service[256];
HANDLE hSub = ccs->hContact;
+ DWORD flags = pre->flags;
mir_snprintf(service, 256, "%s%s", proto, PSR_MESSAGE);
ccs->hContact = hMeta;
+ pre->flags |= (DBGetContactSettingByte(hMeta, META_PROTO, "WindowOpen", 0) ? 0 : PREF_CREATEREAD);
if(ServiceExists(service) && !CallService(service, 0, (LPARAM)ccs))
added = TRUE;
ccs->hContact = hSub;
+ pre->flags = flags;
}
}
diff --git a/metacontacts/version.h b/metacontacts/version.h
index 84ad861..6bae684 100644
--- a/metacontacts/version.h
+++ b/metacontacts/version.h
@@ -4,7 +4,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 12
-#define __RELEASE_NUM 1
+#define __RELEASE_NUM 2
#define __BUILD_NUM 0
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM