From fa2e125ec4535b4a56a33aed76e3a0f9ce75eca0 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 20 Oct 2010 17:28:07 +0200 Subject: client: Interpret the title control message as utf8 instead of unicode16 The activex browser plugin is sending unicode16 text, where as the xpi one is sending utf8 text. After discussing this on irc we've decided that utf8 is what we want to use. So the client (this patch), and the activex will be changed to expect resp. send utf8 text as the title. --- client/controller.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'client/controller.cpp') diff --git a/client/controller.cpp b/client/controller.cpp index 032afae5..6d1272c9 100644 --- a/client/controller.cpp +++ b/client/controller.cpp @@ -308,12 +308,8 @@ bool ControllerConnection::handle_message(ControllerMsg *hdr) _handler->set_auto_display_res(!!(value & CONTROLLER_AUTO_DISPLAY_RES)); break; case CONTROLLER_SET_TITLE: { - std::wstring str; -#ifdef WIN32 - wstring_printf(str, L"%s", data); -#else - wstring_printf(str, L"%S", data); -#endif + std::string str; + string_printf(str, "%s", data); _handler->set_title(str); break; } -- cgit