diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-30 20:04:58 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-30 20:04:58 +0200 |
| commit | b9278adb04c824b47da7ac0ec7c1c8ef5931c888 (patch) | |
| tree | e5adc369ab02ac4a42f6e563dc6d5f9a3141c93b /messages.cpp | |
| parent | 1f5acb24f8483d5d6b0e55299579ad5ee975c9b1 (diff) | |
modified: messages.cpp
modified: utilities.cpp
modified: utilities.h
Diffstat (limited to 'messages.cpp')
| -rw-r--r-- | messages.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/messages.cpp b/messages.cpp index 1509958..3601604 100644 --- a/messages.cpp +++ b/messages.cpp @@ -150,7 +150,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l) { setSrmmIcon(metaGetContact(hContact)); setClistIcon(metaGetContact(hContact)); - HistoryLog(metaGetContact(hContact), "PGP Encryption turned on by key autoexchange feature", EVENTTYPE_MESSAGE, DBEF_READ); + HistoryLog(metaGetContact(hContact), "PGP Encryption turned on by key autoexchange feature", EVENTTYPE_MESSAGE, 0); } HistoryLog(hContact, "PGP Encryption turned on by key autoexchange feature", EVENTTYPE_MESSAGE, 0); } @@ -610,9 +610,16 @@ int SendMsgSvc(WPARAM w, LPARAM l) if(!isContactSecured(hContact)) return CallService(MS_PROTO_CHAINSEND, w, l); - { //encrypt data here - wstring str = toUTF16(msg); + wstring str; + if(!metaIsSubcontact(hContact)) + str = toUTF16(msg); + else + {//workaround ... + wchar_t *tmp = mir_a2t(msg); + str.append(tmp); + mir_free(tmp); + } { //not xmpp, just replace whole message string out; DWORD code; @@ -730,8 +737,8 @@ int SendMsgSvc(WPARAM w, LPARAM l) str_event.insert(0, toUTF8(outopentag)); str_event.append(toUTF8(outclosetag)); } - HistoryLog(hContact, (char*)str_event.c_str(), EVENTTYPE_MESSAGE, DBEF_SENT | DBEF_UTF); - HistoryLog(metaGetContact(hContact), (char*)str_event.c_str(), EVENTTYPE_MESSAGE, DBEF_SENT | DBEF_UTF); + HistoryLog(hContact, (char*)str_event.c_str(), EVENTTYPE_MESSAGE, DBEF_SENT); + HistoryLog(metaGetContact(hContact), (char*)str_event.c_str(), EVENTTYPE_MESSAGE, DBEF_SENT); hcontact_data[hContact].msgs_to_ignore.push_back((char*)ccs->lParam); hcontact_data[metaGetContact(hContact)].msgs_to_ignore.push_back((char*)ccs->lParam); //hmm, twice ? metacontacts !! %) CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)toUTF8(str).c_str()); |