summaryrefslogtreecommitdiff
path: root/messages.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2011-03-22 01:22:10 +0200
committerGluzskiy Alexandr <sss123next@list.ru>2011-03-22 01:22:10 +0200
commit31b78ae77e9dba2afbb2979c7b84631e03869398 (patch)
tree3c8a27ec67c8701038982af19984f17a83d72a9e /messages.cpp
parented8a4f7a485a222ebdf30aa6fd2e7c2344ec27f0 (diff)
fixed toUTF8 fuction crash //thx iexploe
Diffstat (limited to 'messages.cpp')
-rw-r--r--messages.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/messages.cpp b/messages.cpp
index a0389a7..dbb87c2 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-----");
}
}
}
@@ -488,7 +488,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);