Use g_markup_printf_escaped when printing uris

This covers GtkInfoBar in ephy-web-view.c, ephy-download-widget.c and
also tooltips and labels in ephy-download-widget.c

Bug #649164

1 files changed, 2 insertions, 5 deletions

diff --git a/lib/widgets/ephy-download-widget.c b/lib/widgets/ephy-download-widget.c
index ab52e4e72..084116804 100644
--- a/lib/widgets/ephy-download-widget.c
+++ b/lib/widgets/ephy-download-widget.c
@@ -153,7 +153,6 @@ widget_progress_cb (GObject *object,
                     EphyDownloadWidget *widget)
 {
   WebKitDownload *download;
-  char *file;
   char *destination;
   gdouble time;
   char *remaining;
@@ -162,8 +161,7 @@ widget_progress_cb (GObject *object,
   char *remaining_tooltip;
 
   download = WEBKIT_DOWNLOAD (object);
-  file = g_filename_display_basename (webkit_download_get_destination_uri (download));
-  destination = g_uri_unescape_string (file, NULL);
+  destination = g_filename_display_basename (webkit_download_get_destination_uri (download));
   progress = webkit_download_get_progress (download) * 100;
 
   time = get_remaining_time (download);
@@ -174,12 +172,11 @@ widget_progress_cb (GObject *object,
     remaining = g_strdup (_("Finished"));
 
   remaining_label = g_strdup_printf ("%d%% (%s)", progress, remaining);
-  remaining_tooltip = g_strdup_printf ("%s\n%s", destination, remaining_label);
+  remaining_tooltip = g_markup_printf_escaped ("%s\n%s", destination, remaining_label);
 
   gtk_label_set_text (GTK_LABEL (widget->priv->remaining), remaining_label);
   gtk_widget_set_tooltip_text (GTK_WIDGET (widget), remaining_tooltip);
 
-  g_free (file);
   g_free (destination);
   g_free (remaining);
   g_free (remaining_label);