summaryrefslogtreecommitdiff
path: root/protocols/Twitter/chat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/Twitter/chat.cpp')
-rw-r--r--protocols/Twitter/chat.cpp36
1 files changed, 16 insertions, 20 deletions
diff --git a/protocols/Twitter/chat.cpp b/protocols/Twitter/chat.cpp
index 5c247f6bdb..f73b885034 100644
--- a/protocols/Twitter/chat.cpp
+++ b/protocols/Twitter/chat.cpp
@@ -62,32 +62,28 @@ void TwitterProto::UpdateChat(const twitter_user &update)
int TwitterProto::OnChatOutgoing(WPARAM wParam,LPARAM lParam)
{
GCHOOK *hook = reinterpret_cast<GCHOOK*>(lParam);
- char *text;
-
- if(strcmp(hook->pDest->pszModule,m_szModuleName))
+ if ( strcmp(hook->pDest->pszModule, m_szModuleName))
return 0;
- switch(hook->pDest->iType)
- {
- case GC_USER_MESSAGE: {
- text = mir_t2a_cp(hook->ptszText,CP_UTF8);
- LOG (_T("**Chat - Outgoing message: %s"), hook->ptszText);
-
- std::string tweet(text);
- replaceAll(tweet, "%%", "%"); // the chat plugin will turn "%" into "%%", so we have to change it back :/
+ switch(hook->pDest->iType) {
+ case GC_USER_MESSAGE:
+ LOG ( _T("**Chat - Outgoing message: %s"), hook->ptszText);
+ {
+ mir_ptr<char> text( mir_utf8encodeT(hook->ptszText));
- char *varTweet;
- varTweet = mir_utf8encode(tweet.c_str());
- //strncpy(varTweet, tweet.c_str(), tweet.length()+1);
+ std::string tweet(text);
+ replaceAll(tweet, "%%", "%"); // the chat plugin will turn "%" into "%%", so we have to change it back :/
- ForkThread(&TwitterProto::SendTweetWorker, this,varTweet);
+ char *varTweet = mir_strdup( tweet.c_str());
+ ForkThread(&TwitterProto::SendTweetWorker, this, varTweet);
+ }
break;
- }
+
case GC_USER_PRIVMESS:
- text = mir_t2a(hook->ptszUID);
- CallService(MS_MSG_SENDMESSAGE,reinterpret_cast<WPARAM>(
- UsernameToHContact(text)),0);
- mir_free(text);
+ {
+ mir_ptr<char> text( mir_t2a(hook->ptszUID));
+ CallService(MS_MSG_SENDMESSAGE, WPARAM(UsernameToHContact(text)), 0);
+ }
break;
}