[gnome-photos/gnome-3-16] main-toolbar: Escape special characters only when using markup



commit 780b06fb8bcae72f759e1e273637bda55c31e888
Author: Sparsh Paliwal <sparshpaliwal123 gmail com>
Date:   Fri Mar 27 18:53:18 2015 +0530

    main-toolbar: Escape special characters only when using markup
    
    Fall out from f284c1e71108bbfaffc32aaf96326457726823e1
    
    https://bugzilla.gnome.org/show_bug.cgi?id=746252

 src/photos-main-toolbar.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index 3d41c4c..e7d8f78 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -96,7 +96,7 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
       if (!selection_mode)
         {
           if (active_collection != NULL)
-            primary = g_markup_printf_escaped ("%s", photos_base_item_get_name (active_collection));
+            primary = g_strdup (photos_base_item_get_name (active_collection));
         }
       else
         {
@@ -119,7 +119,8 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
             }
           else
             {
-              primary = g_markup_printf_escaped ("%s", label);
+              primary = label;
+              label = NULL;
             }
 
           g_free (label);
@@ -131,7 +132,7 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
 
       item = photos_base_manager_get_active_object (priv->item_mngr);
       if (item != NULL)
-        primary = g_markup_printf_escaped ("%s", photos_base_item_get_name_with_fallback (PHOTOS_BASE_ITEM 
(item)));
+        primary = g_strdup (photos_base_item_get_name_with_fallback (PHOTOS_BASE_ITEM (item)));
     }
 
   if (selection_mode)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]