patchset/0020-UTF8-window-titles.patch

   1 From e43b95f1c1f74ab70798e32b148b47127e760557 Mon Sep 17 00:00:00 2001
   2 From: Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com>
   3 Date: Fri, 9 Aug 2013 12:42:23 +0300
   4 Subject: [PATCH 20/33] UTF8 window titles.
   5
   6 ---
   7  base/strings/efl/eina_shared_string.cc | 7 ++++++-
   8  1 file changed, 6 insertions(+), 1 deletion(-)
   9
  10 diff --git a/base/strings/efl/eina_shared_string.cc b/base/strings/efl/eina_shared_string.cc
  11 index 48bf291..036e4a4 100644
  12 --- a/base/strings/efl/eina_shared_string.cc
  13 +++ b/base/strings/efl/eina_shared_string.cc
  14 @@ -3,6 +3,9 @@
  15  // found in the LICENSE file.
  16
  17  #include "base/strings/efl/eina_shared_string.h"
  18 +#include "base/strings/utf_string_conversions.h"
  19 +
  20 +namespace base {
  21
  22  EinaSharedString::EinaSharedString(const EinaSharedString& other)
  23    : string_(eina_stringshare_ref(other.string_)) {
  24 @@ -17,7 +20,7 @@ EinaSharedString::EinaSharedString(const std::string& str)
  25  }
  26
  27  EinaSharedString::EinaSharedString(const string16& str)
  28 -  : string_(eina_stringshare_add(std::string(str.begin(), str.end()).c_str())) {
  29 +  : string_(eina_stringshare_add(UTF16ToUTF8(str).c_str())) {
  30  }
  31
  32  EinaSharedString::~EinaSharedString() {
  33 @@ -55,3 +58,5 @@ Eina_Stringshare* EinaSharedString::LeakString() {
  34
  35    return sharedString;
  36  }
  37 +
  38 +}  // namespace base
  39 --
  40 1.8.1.2
  41