diff options
author | Hans de Goede <hdegoede@redhat.com> | 2010-10-20 17:28:07 +0200 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2010-10-21 13:19:51 +0200 |
commit | fa2e125ec4535b4a56a33aed76e3a0f9ce75eca0 (patch) | |
tree | aa0e69959c3b4321907ff987849fda2ca46412fc /client/screen.h | |
parent | 79fffbf95d96b0eeb740fdfb9cca285fab8735c6 (diff) | |
download | spice-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/screen.h')
-rw-r--r-- | client/screen.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/screen.h b/client/screen.h index dfef9895..d81ebf83 100644 --- a/client/screen.h +++ b/client/screen.h @@ -54,7 +54,7 @@ private: class RedScreen: public RedWindow::Listener { public: - RedScreen(Application& owner, int id, const std::wstring& name, int width, int height); + RedScreen(Application& owner, int id, const std::string& name, int width, int height); RedScreen* ref(); void unref(); @@ -63,7 +63,7 @@ public: void detach_layer(ScreenLayer& layer); void on_layer_changed(ScreenLayer& layer); void resize(int width, int height); - void set_name(const std::wstring& name); + void set_name(const std::string& name); uint64_t invalidate(const SpiceRect& rect, bool urgent); void invalidate(const QRegion ®ion); void capture_mouse(); @@ -163,7 +163,7 @@ private: Application& _owner; int _id; AtomicCount _refs; - std::wstring _name; + std::string _name; RedWindow _window; std::vector<ScreenLayer*> _layes; QRegion _dirty_region; |