summaryrefslogtreecommitdiff
path: root/messages.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2011-01-29 17:28:12 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2011-01-29 17:28:12 +0300
commit094d38a1686a807bf6b3a2cea3ef027bd70bb05b (patch)
tree1f581582918f670e12c180ede8c6d07f865f8731 /messages.cpp
parent4d9fce6f544f0c6782a7ade4900afd3e1c6c9c52 (diff)
Metacontacts encodings fix
Diffstat (limited to 'messages.cpp')
-rw-r--r--messages.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/messages.cpp b/messages.cpp
index 0289685..c597ee3 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2010 sss
+// Copyright © 2010-2011 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -619,7 +619,7 @@ int SendMsgSvc(WPARAM w, LPARAM l)
str.append(tmp);
mir_free(tmp);
}
- { //not xmpp, just replace whole message
+ {
string out;
DWORD code;
wstring cmd;
@@ -736,11 +736,11 @@ 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);
- HistoryLog(metaGetContact(hContact), (char*)str_event.c_str(), EVENTTYPE_MESSAGE, DBEF_SENT);
+ 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);
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());
+ CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UNICODE, (LPARAM)str.c_str());
return returnNoError(hContact);
}
if(bAppendTags)