nemo-file.c: Escape tooltip text for markup before adding any

search result snippet.

Escaping the entire string would end up breaking highlighting
markup when displaying search results (see c39f0f2).

Author: mtwebster

libnemo-private/nemo-file.c

@@ -8075,7 +8075,6 @@ nemo_file_construct_tooltip (NemoFile *file, NemoFileTooltipFlags flags, gpointe
     gchar *nice = NULL;
     gchar *tmp = NULL;
     gchar *date;
-    gchar *ret;
 
     if (g_strcmp0 (scheme, "x-nemo-desktop") == 0) {
         g_free (scheme);
@@ -8164,6 +8163,10 @@ nemo_file_construct_tooltip (NemoFile *file, NemoFileTooltipFlags flags, gpointe
         }
     }
 
+    gchar *escaped = g_markup_escape_text (string->str, -1);
+    string = g_string_assign (string, escaped);
+    g_free (escaped);
+
     if (search_dir != NULL) {
         gchar *snippet = nemo_file_get_search_result_snippet (file, search_dir);
         if (snippet != NULL) {
@@ -8175,12 +8178,8 @@ nemo_file_construct_tooltip (NemoFile *file, NemoFileTooltipFlags flags, gpointe
         }
     }
 
-    ret = string->str;
-
-    g_string_free (string, FALSE);
     g_free (scheme);
-
-    return ret;
+    return g_string_free (string, FALSE);
 }
 
 gint

libnemo-private/nemo-icon-container.c

@@ -6546,7 +6546,7 @@ nemo_icon_container_update_tooltip_text (NemoIconContainer  *container,
                    file,
                    &text);
 
-    gtk_widget_set_tooltip_text (GTK_WIDGET (container), text);
+    gtk_widget_set_tooltip_markup (GTK_WIDGET (container), text);
 
     g_free (text);
 }