From be52d147c0aed74078cfe3665da723554a9500b1 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 21 Aug 2010 20:27:28 +0300 Subject: modified: init.cpp modified: messages.cpp modified: options.cpp modified: utilities.cpp --- messages.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'messages.cpp') diff --git a/messages.cpp b/messages.cpp index 7b294d4..ad87255 100644 --- a/messages.cpp +++ b/messages.cpp @@ -247,7 +247,7 @@ int SendMsgSvc(WPARAM w, LPARAM l) DWORD code; wstring cmd; wstring path; - extern bool bJabberAPI; + extern bool bJabberAPI, bIsMiranda09; char *tmp = UniGetContactSettingUtf(ccs->hContact, szGPGModuleName, "KeyID", ""); if(strlen(tmp) < 2) { @@ -255,7 +255,7 @@ int SendMsgSvc(WPARAM w, LPARAM l) HistoryLog(ccs->hContact, "Failed to encrypt message with GPG", EVENTTYPE_MESSAGE, DBEF_SENT); return CallService(MS_PROTO_CHAINSEND, w, l); } - if(!bJabberAPI) + if(!bJabberAPI || !bIsMiranda09) cmd += _T("--comment \"\" --no-version "); if(DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwaysTrust", 0)) cmd += _T("--trust-model always "); @@ -313,7 +313,7 @@ int SendMsgSvc(WPARAM w, LPARAM l) TCHAR tmp[128]; f.getline(tmp, 128); str.append(tmp); - if(bJabberAPI) + if(bJabberAPI && bIsMiranda09) str.append(_T("\n")); else str.append(_T("\r\n")); -- cgit v1.2.3