From f3e66561e402280f6549aef2341217f2d09af214 Mon Sep 17 00:00:00 2001 From: Alexander Gluzsky Date: Mon, 10 Aug 2015 03:41:45 +0000 Subject: new_gpg: switched to new outgoing message filtering api (fix for outgoing tags problem) git-svn-id: http://svn.miranda-ng.org/main/trunk@14891 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/src/init.cpp | 3 ++- plugins/New_GPG/src/messages.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 plugins/New_GPG/src/init.cpp diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp old mode 100644 new mode 100755 index 2e30326e0f..b238e954a3 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -142,7 +142,8 @@ static int OnModulesLoaded(WPARAM, LPARAM) GetJabberInterface(0,0); HookEvent(ME_OPT_INITIALISE, GpgOptInit); - HookEvent(ME_DB_EVENT_FILTER_ADD, HookSendMsg); + //HookEvent(ME_DB_EVENT_FILTER_ADD, HookSendMsg); + HookEvent(ME_MSG_PRECREATEEVENT, HookSendMsg); if(bJabberAPI && bIsMiranda09) HookEvent(ME_PROTO_ACCLISTCHANGED, GetJabberInterface); diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp index 3890e57e45..e80bc328ee 100755 --- a/plugins/New_GPG/src/messages.cpp +++ b/plugins/New_GPG/src/messages.cpp @@ -791,10 +791,13 @@ int HookSendMsg(WPARAM w, LPARAM l) { if(!l) return 0; - DBEVENTINFO * dbei = (DBEVENTINFO*)l; + MessageWindowEvent *ev = (MessageWindowEvent*)l; + DBEVENTINFO * dbei = ev->dbei; + if(!dbei) + return 0; if(dbei->eventType != EVENTTYPE_MESSAGE) return 0; - MCONTACT hContact = (MCONTACT)w; + MCONTACT hContact = ev->hContact; if(dbei->flags & DBEF_SENT) { if(isContactSecured(hContact) && strstr((char*)dbei->pBlob, "-----BEGIN PGP MESSAGE-----")) //our service data, can be double added by metacontacts e.t.c. -- cgit v1.2.3