From e64af5a540c207def33e9413228e9be64b42f13b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Sun, 17 Jun 2012 17:09:19 +0000 Subject: FacebookRM sync. git-svn-id: http://svn.miranda-ng.org/main/trunk@466 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/proto.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'protocols/FacebookRM/proto.cpp') diff --git a/protocols/FacebookRM/proto.cpp b/protocols/FacebookRM/proto.cpp index 72222c1403..50ff0f66bc 100644 --- a/protocols/FacebookRM/proto.cpp +++ b/protocols/FacebookRM/proto.cpp @@ -492,18 +492,17 @@ int FacebookProto::CancelFriendship(WPARAM wParam,LPARAM lParam) return 0; DBVARIANT dbv; - char str[256]; + TCHAR tstr[256]; - if ( !DBGetContactSettingUTF8String(hContact, m_szModuleName, FACEBOOK_KEY_NAME, &dbv) ) { - mir_snprintf(str,SIZEOF(str),Translate("Do you want to cancel your friendship with '%s'?"), dbv.pszVal); + if ( !DBGetContactSettingTString(hContact, m_szModuleName, FACEBOOK_KEY_NAME, &dbv) ) { + mir_sntprintf(tstr,SIZEOF(tstr),TranslateT("Do you want to cancel your friendship with '%s'?"), dbv.ptszVal); DBFreeVariant(&dbv); - } else if ( !DBGetContactSettingUTF8String(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv) ) { - mir_snprintf(str,SIZEOF(str),Translate("Do you want to cancel your friendship with '%s'?"), dbv.pszVal); + } else if ( !DBGetContactSettingTString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv) ) { + mir_sntprintf(tstr,SIZEOF(tstr),TranslateT("Do you want to cancel your friendship with '%s'?"), dbv.ptszVal); DBFreeVariant(&dbv); } - TCHAR *text = mir_a2t_cp(str, CP_UTF8); - if (MessageBox( 0, text, m_tszUserName, MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2 ) == IDYES) { + if (MessageBox( 0, tstr, m_tszUserName, MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2 ) == IDYES) { if ( !DBGetContactSettingString(hContact,m_szModuleName,FACEBOOK_KEY_ID,&dbv) ) { @@ -521,7 +520,6 @@ int FacebookProto::CancelFriendship(WPARAM wParam,LPARAM lParam) } } - mir_free(text); return 0; } -- cgit v1.2.3