diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-22 02:16:45 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-22 02:16:45 +0200 |
| commit | b0e1bb306eec7f2d13ff385d4c1191646cc3e7f9 (patch) | |
| tree | 359bfaab5e9fd2fd49a740aceff1e5573e0aba15 /messages.cpp | |
| parent | be35d4a3d07f44604ad71e6c6997c47f8b5bcdde (diff) | |
| parent | 6fc50b0001b4edb38f1a6d194a43d5622a0a0f94 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Diffstat (limited to 'messages.cpp')
| -rw-r--r-- | messages.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/messages.cpp b/messages.cpp index 2e3c78f..40db55c 100644 --- a/messages.cpp +++ b/messages.cpp @@ -245,7 +245,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l) } mir_free(caps); if(str.find(_T("GPG_Key_Auto_Exchange:0")) != string::npos) - CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"-----PGP KEY REQUEST-----"); + CallContactService(hContact, PSS_MESSAGE, (WPARAM)0, (LPARAM)"-----PGP KEY REQUEST-----"); } } } @@ -512,7 +512,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l) { string str = pre->szMessage; mir_free((void**)pre->szMessage); - str.insert(0, "Failed to decrypt GPG encrypted message.\nReceived unencrypted message:\n"); + str.insert(0, "Failed to decrypt GPG encrypted message.\nMessage body for manual decryption:\n"); debuglog<<time_str()<<": info: Failed to decrypt GPG encrypted message.\n"; pre->szMessage = mir_strdup(str.c_str()); return CallService(MS_PROTO_CHAINRECV, w, (LPARAM)ccs); |