summaryrefslogtreecommitdiff
path: root/protocols/Twitter
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/Twitter')
-rw-r--r--protocols/Twitter/src/chat.cpp2
-rw-r--r--protocols/Twitter/src/contacts.cpp7
2 files changed, 4 insertions, 5 deletions
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());