summaryrefslogtreecommitdiffstats
path: root/client/application.cpp
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-10-20 17:28:07 +0200
committerHans de Goede <hdegoede@redhat.com>2010-10-21 13:19:51 +0200
commitfa2e125ec4535b4a56a33aed76e3a0f9ce75eca0 (patch)
treeaa0e69959c3b4321907ff987849fda2ca46412fc /client/application.cpp
parent79fffbf95d96b0eeb740fdfb9cca285fab8735c6 (diff)
downloadspice-fa2e125ec4535b4a56a33aed76e3a0f9ce75eca0.tar.gz
spice-fa2e125ec4535b4a56a33aed76e3a0f9ce75eca0.tar.xz
spice-fa2e125ec4535b4a56a33aed76e3a0f9ce75eca0.zip
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.
Diffstat (limited to 'client/application.cpp')
-rw-r--r--client/application.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/application.cpp b/client/application.cpp
index 212b20ef..d5b24a78 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -355,7 +355,7 @@ Application::Application()
, _key_handler (&default_key_handler)
, _mouse_handler (&default_mouse_handler)
, _monitors (NULL)
- , _title (L"SPICEc:%d")
+ , _title ("SPICEc:%d")
, _sys_key_intercept_mode (false)
, _enable_controller (false)
#ifdef USE_GUI
@@ -1603,7 +1603,7 @@ uint32_t Application::get_mouse_mode()
return _client.get_mouse_mode();
}
-void Application::set_title(const std::wstring& title)
+void Application::set_title(const std::string& title)
{
_title = title;