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/Twitter/src/chat.cpp | 2 +- protocols/Twitter/src/contacts.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'protocols/Twitter') diff --git a/protocols/Twitter/src/chat.cpp b/protocols/Twitter/src/chat.cpp index 5990cb63a1..6771ce6cd2 100644 --- a/protocols/Twitter/src/chat.cpp +++ b/protocols/Twitter/src/chat.cpp @@ -66,7 +66,7 @@ int TwitterProto::OnChatOutgoing(WPARAM, LPARAM lParam) case GC_USER_MESSAGE: debugLog(_T("**Chat - Outgoing message: %s"), hook->ptszText); { - ptrA text(mir_utf8encodeT(hook->ptszText)); + T2Utf text(hook->ptszText); std::string tweet(text); replaceAll(tweet, "%%", "%"); // the chat plugin will turn "%" into "%%", so we have to change it back :/ diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp index cea1ce17ef..e58c6ee01f 100644 --- a/protocols/Twitter/src/contacts.cpp +++ b/protocols/Twitter/src/contacts.cpp @@ -107,14 +107,13 @@ void TwitterProto::DoSearch(void *p) bool found = false; try { - char *p = mir_utf8encodeT(query->query.c_str()); + T2Utf p(query->query.c_str()); mir_cslock s(twitter_lock_); if (query->by_email) - found = twit_.get_info_by_email(p, &info); + found = twit_.get_info_by_email(p.str(), &info); else - found = twit_.get_info(p, &info); - mir_free(p); + found = twit_.get_info(p.str(), &info); } catch (const std::exception &e) { ShowPopup((std::string("While searching for contacts, an error occurred: ") + e.what()).c_str()); -- cgit v1.2.3