From 094d38a1686a807bf6b3a2cea3ef027bd70bb05b Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 29 Jan 2011 17:28:12 +0300 Subject: Metacontacts encodings fix --- init.cpp | 8 ++++---- messages.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/init.cpp b/init.cpp index 7983659..8af16e6 100644 --- a/init.cpp +++ b/init.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 @@ -42,11 +42,11 @@ std::map hcontact_data; PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), 0, - PLUGIN_MAKE_VERSION(0,0,0,9), - "new GPG encryption support plugin, used code from http://addons.miranda-im.org/details.php?action=viewfile&id=3485", + PLUGIN_MAKE_VERSION(0,0,0,10), + "new GPG encryption support plugin, based on code from old gpg plugin and secureim", "sss", "sss123next@list.ru", - "© 2010 sss", + "© 2010-2011 sss", "http://sss.chaoslab.ru/tracker/mim_plugs/", 1, //unicode 0, //doesn't replace anything built-in 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) -- cgit v1.2.3