diff options
author | George Hazan <george.hazan@gmail.com> | 2013-04-08 11:49:31 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-04-08 11:49:31 +0000 |
commit | 3e0eb53fca2111c541cf15d5bdd3282d048fd2fb (patch) | |
tree | 3f778a959d8f4be728b51023b00d50a9fcb12983 /plugins/MetaContacts/src | |
parent | 6b05d57a1d02f233409a2e4392e22b7a3a756a8f (diff) |
rollback of rev.4282, cause it causes problems even without Secure IM
git-svn-id: http://svn.miranda-ng.org/main/trunk@4385 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MetaContacts/src')
-rwxr-xr-x | plugins/MetaContacts/src/meta_services.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp index 5a02ddfe42..70109cc651 100755 --- a/plugins/MetaContacts/src/meta_services.cpp +++ b/plugins/MetaContacts/src/meta_services.cpp @@ -397,11 +397,13 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam) // use the subcontact's protocol 'recv' service to add the meta's history (AIMOSCAR removes HTML here!) if possible
char *proto = GetContactProto(ccs->hContact);
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 |= (db_get_b(hMeta, META_PROTO, "WindowOpen", 0) ? 0 : PREF_CREATEREAD);
- if (!CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)ccs))
+ if (ServiceExists(service) && !CallService(service, 0, (LPARAM)ccs))
added = TRUE;
ccs->hContact = hSub;
pre->flags = flags;
|