From e2c2a1f5a84c6c9b705dc85c6a2dd1f97edd57e4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 22 May 2015 16:04:17 +0000 Subject: T2Utf - handy replacement for ptrA git-svn-id: http://svn.miranda-ng.org/main/trunk@13758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/process.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'protocols/FacebookRM/src/process.cpp') diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp index af61679db4..e89049cd70 100644 --- a/protocols/FacebookRM/src/process.cpp +++ b/protocols/FacebookRM/src/process.cpp @@ -27,7 +27,8 @@ along with this program. If not, see . /** * Helper function for loading name from database (or use default one specified as parameter), used for title of few notifications. */ -std::string getContactName(FacebookProto *proto, MCONTACT hContact, const char *defaultName) { +std::string getContactName(FacebookProto *proto, MCONTACT hContact, const char *defaultName) +{ std::string name = defaultName; DBVARIANT dbv; @@ -1225,8 +1226,7 @@ void FacebookProto::SearchAckThread(void *targ) int count = 0; - char *arg = mir_utf8encodeT((TCHAR*)targ); - std::string search = utils::url::encode(arg); + std::string search = utils::url::encode(T2Utf((TCHAR *)targ).str()); std::string ssid; while (count < 50 && !isOffline()) @@ -1300,15 +1300,13 @@ void FacebookProto::SearchAckThread(void *targ) facy.handle_success("searchAckThread"); mir_free(targ); - mir_free(arg); } void FacebookProto::SearchIdAckThread(void *targ) { facy.handle_entry("searchIdAckThread"); - char *arg = mir_utf8encodeT((TCHAR*)targ); - std::string search = utils::url::encode(arg) + "?"; + std::string search = utils::url::encode(T2Utf((TCHAR*)targ).str()) + "?"; if (!isOffline()) { @@ -1358,5 +1356,4 @@ void FacebookProto::SearchIdAckThread(void *targ) facy.handle_success("searchIdAckThread"); mir_free(targ); - mir_free(arg); } -- cgit v1.2.3