Merge lp:~nick-dedekind/unity/lp1039020.preview-text-escape into lp:unity

[Nick Dedekind]

Fixes non-escaped character sequences in dash previews. (LP #1039020)

Fixes non-escaped character sequences in dash previews. (LP #1039020)

Added escape sequent argument to a new StaticCairoText constructor for ease of access.
Dash Previews escape all strings from UnityCore preview models.

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

[Andrea Azzarone (azzar1)]

+ std::string tmp_text = escape_text ? GetEscapedText(text) : text;

You can do:

std::string tmp_text = escape_text ? GetEscapedText(text) : std::move(text);

But using the gcc implementation of std::string coping and moving are equivalent.

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in dash/previews/PreviewRatingsWidget.cpp

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2012-08-17 08:20:41 +0000
+++ dash/previews/ActionButton.cpp	2012-08-28 08:32:21 +0000
@@ -139,7 +139,7 @@
 
     if (!label_.empty())
     {
-      static_text_ = new nux::StaticCairoText(label_, NUX_TRACKER_LOCATION);
+      static_text_ = new nux::StaticCairoText(label_, true, NUX_TRACKER_LOCATION);
       if (!font_hint_.empty())
         static_text_->SetFont(font_hint_);
       static_text_->SetInputEventSensitivity(false);
 
=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2012-08-22 08:16:02 +0000
+++ dash/previews/ApplicationPreview.cpp	2012-08-28 08:32:21 +0000
@@ -202,14 +202,14 @@
         title_subtitle_layout_ = new nux::VLayout();
         title_subtitle_layout_->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
-        title_ = new nux::StaticCairoText(app_preview_model->title);
+        title_ = new nux::StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
         title_->SetLines(-1);
         title_->SetFont(style.title_font().c_str());
         title_subtitle_layout_->AddView(title_.GetPointer(), 1);
 
-        if (!app_preview_model->subtitle.Get().empty())
+        if (!preview_model_->subtitle.Get().empty())
         {
-          subtitle_ = new nux::StaticCairoText(app_preview_model->subtitle);
+          subtitle_ = new nux::StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
           subtitle_->SetFont(style.subtitle_size_font().c_str());
           subtitle_->SetLines(-1);
           title_subtitle_layout_->AddView(subtitle_.GetPointer(), 1);
@@ -220,7 +220,7 @@
 
         if (!app_preview_model->license.Get().empty())
         {
-          license_ = new nux::StaticCairoText(app_preview_model->license);
+          license_ = new nux::StaticCairoText(app_preview_model->license, true, NUX_TRACKER_LOCATION);
           license_->SetFont(style.app_license_font().c_str());
           license_->SetLines(-1);
           app_updated_copywrite_layout->AddView(license_.GetPointer(), 1);
@@ -231,14 +231,14 @@
           std::stringstream last_update;
           last_update << _("Last Updated") << " " << app_preview_model->last_update.Get();
 
-          last_update_ = new nux::StaticCairoText(last_update.str());
+          last_update_ = new nux::StaticCairoText(last_update.str(), true, NUX_TRACKER_LOCATION);
           last_update_->SetFont(style.app_last_update_font().c_str());
           app_updated_copywrite_layout->AddView(last_update_.GetPointer(), 1);
         }
 
         if (!app_preview_model->copyright.Get().empty())
         {
-          copywrite_ = new nux::StaticCairoText(app_preview_model->copyright);
+          copywrite_ = new nux::StaticCairoText(app_preview_model->copyright, true, NUX_TRACKER_LOCATION);
           copywrite_->SetFont(style.app_copywrite_font().c_str());
           copywrite_->SetLines(-1);
           app_updated_copywrite_layout->AddView(copywrite_.GetPointer(), 1);
@@ -265,12 +265,11 @@
 
       if (!preview_model_->description.Get().empty())
       {
-        description_ = new nux::StaticCairoText("");
+        description_ = new nux::StaticCairoText(preview_model_->description, false, NUX_TRACKER_LOCATION); // not escaped!
         description_->SetFont(style.description_font().c_str());
         description_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
-        description_->SetText(app_preview_model->description);
         app_info_layout->AddView(description_.GetPointer());
       }
 
 
=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp	2012-08-22 08:16:02 +0000
+++ dash/previews/GenericPreview.cpp	2012-08-28 08:32:21 +0000
@@ -168,14 +168,14 @@
       nux::VLayout* preview_data_layout = new nux::VLayout();
       preview_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
-      title_ = new nux::StaticCairoText(preview_model_->title);
+      title_ = new nux::StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
       title_->SetLines(-1);
       title_->SetFont(style.title_font().c_str());
       preview_data_layout->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
-        subtitle_ = new nux::StaticCairoText(preview_model_->subtitle);
+        subtitle_ = new nux::StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
         subtitle_->SetLines(-1);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
         preview_data_layout->AddView(subtitle_.GetPointer(), 1);
@@ -193,12 +193,11 @@
 
       if (!preview_model_->description.Get().empty())
       {
-        description_ = new nux::StaticCairoText("");
+        description_ = new nux::StaticCairoText(preview_model_->description, false, NUX_TRACKER_LOCATION); // not escaped!
         description_->SetFont(style.description_font().c_str());
         description_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
-        description_->SetText(preview_model_->description);
         preview_info_layout->AddView(description_.GetPointer());
       }
 
 
=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp	2012-08-22 08:16:02 +0000
+++ dash/previews/MoviePreview.cpp	2012-08-28 08:32:21 +0000
@@ -178,14 +178,14 @@
       nux::VLayout* app_data_layout = new nux::VLayout();
       app_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
-      title_ = new nux::StaticCairoText(preview_model_->title);
+      title_ = new nux::StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
       title_->SetLines(-1);
       title_->SetFont(style.title_font().c_str());
       app_data_layout->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
-        subtitle_ = new nux::StaticCairoText(preview_model_->subtitle);
+        subtitle_ = new nux::StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
         subtitle_->SetLines(-1);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
         app_data_layout->AddView(subtitle_.GetPointer(), 1);
@@ -217,12 +217,11 @@
 
       if (!preview_model_->description.Get().empty())
       {
-        description_ = new nux::StaticCairoText("");
+        description_ = new nux::StaticCairoText(preview_model_->description, false, NUX_TRACKER_LOCATION); // not escaped!
         description_->SetFont(style.description_font().c_str());
         description_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_TOP);
         description_->SetLines(-style.GetDescriptionLineCount());
         description_->SetLineSpacing(style.GetDescriptionLineSpacing());
-        description_->SetText(preview_model_->description);
         preview_info_layout->AddView(description_.GetPointer());
       }
       /////////////////////
 
=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2012-08-22 08:16:02 +0000
+++ dash/previews/MusicPreview.cpp	2012-08-28 08:32:21 +0000
@@ -160,14 +160,14 @@
       nux::VLayout* album_data_layout = new nux::VLayout();
       album_data_layout->SetSpaceBetweenChildren(style.GetSpaceBetweenTitleAndSubtitle());
 
-      title_ = new nux::StaticCairoText(preview_model_->title);
+      title_ = new nux::StaticCairoText(preview_model_->title, true, NUX_TRACKER_LOCATION);
       title_->SetFont(style.title_font().c_str());
       title_->SetLines(-1);
       album_data_layout->AddView(title_.GetPointer(), 1);
 
       if (!preview_model_->subtitle.Get().empty())
       {
-        subtitle_ = new nux::StaticCairoText(preview_model_->subtitle);
+        subtitle_ = new nux::StaticCairoText(preview_model_->subtitle, true, NUX_TRACKER_LOCATION);
         subtitle_->SetFont(style.subtitle_size_font().c_str());
         subtitle_->SetLines(-1);
         album_data_layout->AddView(subtitle_.GetPointer(), 1);
 
=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2012-08-17 08:20:41 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2012-08-28 08:32:21 +0000
@@ -160,14 +160,14 @@
       std::string tmp_display_name = info_hint->display_name;
       tmp_display_name += ":";
 
-      info_name = new nux::StaticCairoText(tmp_display_name, NUX_TRACKER_LOCATION);
+      info_name = new nux::StaticCairoText(tmp_display_name, true, NUX_TRACKER_LOCATION);
       info_name->SetFont(style.info_hint_bold_font());
       info_name->SetLines(-1);
       info_name->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_RIGHT);
       hint_layout->AddView(info_name.GetPointer(), 0, nux::MINOR_POSITION_CENTER);
     }
 
-    StaticCairoTextPtr info_value(new nux::StaticCairoText(StringFromVariant(info_hint->value), NUX_TRACKER_LOCATION));
+    StaticCairoTextPtr info_value(new nux::StaticCairoText(StringFromVariant(info_hint->value), true, NUX_TRACKER_LOCATION));
     info_value->SetFont(style.info_hint_font());
     info_value->SetLines(-1);
     hint_layout->AddView(info_value.GetPointer(), 1, nux::MINOR_POSITION_CENTER);
 
=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
--- dash/previews/PreviewRatingsWidget.cpp	2012-08-17 08:20:41 +0000
+++ dash/previews/PreviewRatingsWidget.cpp	2012-08-28 08:32:21 +0000
@@ -52,7 +52,7 @@
   ratings_->SetEditable(false);
   layout->AddView(ratings_);
   
-  reviews_ = new nux::StaticCairoText("");
+  reviews_ = new nux::StaticCairoText("", NUX_TRACKER_LOCATION);
   reviews_->SetFont(style.user_rating_font());
   layout->AddView(reviews_);
 
 
=== modified file 'dash/previews/Track.cpp'
--- dash/previews/Track.cpp	2012-08-22 10:03:52 +0000
+++ dash/previews/Track.cpp	2012-08-28 08:32:21 +0000
@@ -159,7 +159,7 @@
   uri_ = track.uri;
   progress_ = track.progress;
 
-  title_->SetText(track.title);
+  title_->SetText(track.title, true);
 
   std::stringstream ss_track_number;
   ss_track_number << track.track_number;
 
=== modified file 'tests/test_previews_application.cpp'
--- tests/test_previews_application.cpp	2012-08-15 11:23:55 +0000
+++ tests/test_previews_application.cpp	2012-08-28 08:32:21 +0000
@@ -70,16 +70,16 @@
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
     unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
-    unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "License");
-    unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Copywrite");
+    unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "License & special char");
+    unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Copywrite & special char");
     unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
     unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.8);
     unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 12);
 
     unity_protocol_preview_set_image_source_uri(proto_obj, "http://ia.media-imdb.com/images/M/MV5BMTM3NDM5MzY5Ml5BMl5BanBnXkFtZTcwNjExMDUwOA@@._V1._SY317_.jpg");
-    unity_protocol_preview_set_title(proto_obj, "Application Title");
-    unity_protocol_preview_set_subtitle(proto_obj, "Application Subtitle");
-    unity_protocol_preview_set_description(proto_obj, "Application Desctiption");
+    unity_protocol_preview_set_title(proto_obj, "Application Title & special char");
+    unity_protocol_preview_set_subtitle(proto_obj, "Application Subtitle > special char");
+    unity_protocol_preview_set_description(proto_obj, "Application Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
     unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
     unity_protocol_preview_add_info_hint(proto_obj, "hint1", "Hint 1", NULL, g_variant_new("s", "string hint 1"));
@@ -110,12 +110,12 @@
 {  
   MockApplicationPreview::Ptr preview_view(new MockApplicationPreview(preview_model_));
 
-  EXPECT_EQ(preview_view->title_->GetText(), "Application Title");
-  EXPECT_EQ(preview_view->subtitle_->GetText(), "Application Subtitle");
-  EXPECT_EQ(preview_view->description_->GetText(), "Application Desctiption");
-  EXPECT_EQ(preview_view->license_->GetText(), "License");
+  EXPECT_EQ(preview_view->title_->GetText(), "Application Title &amp; special char");
+  EXPECT_EQ(preview_view->subtitle_->GetText(), "Application Subtitle &gt; special char");
+  EXPECT_EQ(preview_view->description_->GetText(), "Application Desctiption &lt; special char");
+  EXPECT_EQ(preview_view->license_->GetText(), "License &amp; special char");
   //EXPECT_EQ(preview_view->last_update_->GetText(), "Last Updated 11th Apr 2012"); // Not 100% sure this will work with translations.
-  EXPECT_EQ(preview_view->copywrite_->GetText(), "Copywrite");
+  EXPECT_EQ(preview_view->copywrite_->GetText(), "Copywrite &amp; special char");
 
   EXPECT_EQ(preview_view->app_rating_->GetRating(), 0.8f);
   EXPECT_EQ(preview_view->action_buttons_.size(), 2);
 
=== modified file 'tests/test_previews_generic.cpp'
--- tests/test_previews_generic.cpp	2012-08-15 11:23:55 +0000
+++ tests/test_previews_generic.cpp	2012-08-28 08:32:21 +0000
@@ -64,9 +64,9 @@
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_generic_preview_new()));
 
     unity_protocol_preview_set_image_source_uri(proto_obj, "http://ia.media-imdb.com/images/M/MV5BMTM3NDM5MzY5Ml5BMl5BanBnXkFtZTcwNjExMDUwOA@@._V1._SY317_.jpg");
-    unity_protocol_preview_set_title(proto_obj, "Generic Title");
-    unity_protocol_preview_set_subtitle(proto_obj, "Generic Subtitle");
-    unity_protocol_preview_set_description(proto_obj, "Generic Desctiption");
+    unity_protocol_preview_set_title(proto_obj, "Generic Title & special char");
+    unity_protocol_preview_set_subtitle(proto_obj, "Generic Subtitle > special char");
+    unity_protocol_preview_set_description(proto_obj, "Generic Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
     unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
     unity_protocol_preview_add_info_hint(proto_obj, "hint1", "Hint 1", NULL, g_variant_new("s", "string hint 1"));
@@ -97,9 +97,9 @@
 {
   MockGenericPreview::Ptr preview_view(new MockGenericPreview(preview_model_));
 
-  EXPECT_EQ(preview_view->title_->GetText(), "Generic Title");
-  EXPECT_EQ(preview_view->subtitle_->GetText(), "Generic Subtitle");
-  EXPECT_EQ(preview_view->description_->GetText(), "Generic Desctiption");
+  EXPECT_EQ(preview_view->title_->GetText(), "Generic Title &amp; special char");
+  EXPECT_EQ(preview_view->subtitle_->GetText(), "Generic Subtitle &gt; special char");
+  EXPECT_EQ(preview_view->description_->GetText(), "Generic Desctiption &lt; special char");
 
   EXPECT_EQ(preview_view->action_buttons_.size(), 2);
 }
 
=== modified file 'tests/test_previews_movie.cpp'
--- tests/test_previews_movie.cpp	2012-08-15 11:23:55 +0000
+++ tests/test_previews_movie.cpp	2012-08-28 08:32:21 +0000
@@ -70,9 +70,9 @@
     unity_protocol_movie_preview_set_num_ratings(UNITY_PROTOCOL_MOVIE_PREVIEW(proto_obj.RawPtr()), 12);
 
     unity_protocol_preview_set_image_source_uri(proto_obj, "http://ia.media-imdb.com/images/M/MV5BMTM3NDM5MzY5Ml5BMl5BanBnXkFtZTcwNjExMDUwOA@@._V1._SY317_.jpg");
-    unity_protocol_preview_set_title(proto_obj, "Movie Title");
-    unity_protocol_preview_set_subtitle(proto_obj, "Movie Subtitle");
-    unity_protocol_preview_set_description(proto_obj, "Movie Desctiption");
+    unity_protocol_preview_set_title(proto_obj, "Movie Title & special char");
+    unity_protocol_preview_set_subtitle(proto_obj, "Movie Subtitle > special char");
+    unity_protocol_preview_set_description(proto_obj, "Movie Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
     unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
     unity_protocol_preview_add_info_hint(proto_obj, "hint1", "Hint 1", NULL, g_variant_new("s", "string hint 1"));
@@ -103,9 +103,9 @@
 {
   MockMoviePreview::Ptr preview_view(new MockMoviePreview(preview_model_));
 
-  EXPECT_EQ(preview_view->title_->GetText(), "Movie Title");
-  EXPECT_EQ(preview_view->subtitle_->GetText(), "Movie Subtitle");
-  EXPECT_EQ(preview_view->description_->GetText(), "Movie Desctiption");
+  EXPECT_EQ(preview_view->title_->GetText(), "Movie Title &amp; special char");
+  EXPECT_EQ(preview_view->subtitle_->GetText(), "Movie Subtitle &gt; special char");
+  EXPECT_EQ(preview_view->description_->GetText(), "Movie Desctiption &lt; special char");
 
   EXPECT_EQ(preview_view->rating_->GetRating(), 0.8f);
   EXPECT_EQ(preview_view->action_buttons_.size(), 2);
 
=== modified file 'tests/test_previews_music.cpp'
--- tests/test_previews_music.cpp	2012-08-15 11:23:55 +0000
+++ tests/test_previews_music.cpp	2012-08-28 08:32:21 +0000
@@ -65,9 +65,9 @@
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_music_preview_new()));
 
     unity_protocol_preview_set_image_source_uri(proto_obj, "http://ia.media-imdb.com/images/M/MV5BMTM3NDM5MzY5Ml5BMl5BanBnXkFtZTcwNjExMDUwOA@@._V1._SY317_.jpg");
-    unity_protocol_preview_set_title(proto_obj, "Music Title");
-    unity_protocol_preview_set_subtitle(proto_obj, "Music Subtitle");
-    unity_protocol_preview_set_description(proto_obj, "Music Desctiption");
+    unity_protocol_preview_set_title(proto_obj, "Music Title & special char");
+    unity_protocol_preview_set_subtitle(proto_obj, "Music Subtitle > special char");
+    unity_protocol_preview_set_description(proto_obj, "Music Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
     unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
     unity_protocol_preview_add_action(proto_obj, "action3", "Action 3", NULL, 0);
@@ -100,8 +100,8 @@
 {
   MockMusicPreview::Ptr preview_view(new MockMusicPreview(preview_model_));
 
-  EXPECT_EQ(preview_view->title_->GetText(), "Music Title");
-  EXPECT_EQ(preview_view->subtitle_->GetText(), "Music Subtitle");
+  EXPECT_EQ(preview_view->title_->GetText(), "Music Title &amp; special char");
+  EXPECT_EQ(preview_view->subtitle_->GetText(), "Music Subtitle &gt; special char");
 
   EXPECT_EQ(preview_view->action_buttons_.size(), 4);
 }
 
=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2012-08-15 16:21:08 +0000
+++ unity-shared/StaticCairoText.cpp	2012-08-28 08:32:21 +0000
@@ -162,6 +162,16 @@
   SetAcceptKeyNavFocusOnMouseDown(false);
 }
 
+StaticCairoText::StaticCairoText(std::string const& text, bool escape_text,
+                                 NUX_FILE_LINE_DECL)
+  : View(NUX_FILE_LINE_PARAM)
+  , pimpl(new Impl(this, escape_text ? GetEscapedText(text) : text))
+{
+  SetMinimumSize(1, 1);
+  SetAcceptKeyNavFocusOnMouseDown(false);
+}
+
+
 StaticCairoText::~StaticCairoText()
 {
   delete pimpl;
@@ -298,11 +308,13 @@
   // intentionally left empty
 }
 
-void StaticCairoText::SetText(std::string const& text)
+void StaticCairoText::SetText(std::string const& text, bool escape_text)
 {
-  if (pimpl->text_ != text)
+  std::string tmp_text = escape_text ? GetEscapedText(text) : text;
+
+  if (pimpl->text_ != tmp_text)
   {
-    pimpl->text_ = text;
+    pimpl->text_ = tmp_text;
     pimpl->need_new_extent_cache_ = true;
     pimpl->UpdateTexture();
     sigTextChanged.emit(this);
@@ -337,6 +349,11 @@
   return pimpl->text_;
 }
 
+std::string StaticCairoText::GetEscapedText(std::string const& text)
+{
+  return glib::String(g_markup_escape_text(text.c_str(), -1)).Str();
+}
+
 Color StaticCairoText::GetTextColor() const
 {
   return pimpl->text_color_;
 
=== modified file 'unity-shared/StaticCairoText.h'
--- unity-shared/StaticCairoText.h	2012-08-15 16:21:08 +0000
+++ unity-shared/StaticCairoText.h	2012-08-28 08:32:21 +0000
@@ -52,6 +52,7 @@
   };
 
   StaticCairoText(std::string const& text, NUX_FILE_LINE_PROTO);
+  StaticCairoText(std::string const& text, bool escape_text, NUX_FILE_LINE_PROTO);
   ~StaticCairoText();
 
   void PreLayoutManagement();
@@ -68,7 +69,7 @@
                 bool             forceDraw);
 
   // public API
-  void SetText(std::string const& text);
+  void SetText(std::string const& text, bool escape_text = false);
   void SetTextColor(Color const& textColor);
   void SetTextEllipsize(EllipsizeState state);
   void SetTextAlignment(AlignState state);
@@ -95,6 +96,8 @@
   void SetMaximumSize(int w, int h);
   void SetMaximumWidth(int w);
 
+  static std::string GetEscapedText(std::string const& text);
+
 protected:
   // Key navigation
   virtual bool AcceptKeyNavFocus();