aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <descalante@igalia.com>2011-07-31 08:07:16 +0800
committerDiego Escalante Urrelo <descalante@igalia.com>2011-08-13 00:03:04 +0800
commite6945b6c75103866ac890219e93463ff4ce06183 (patch)
tree271e98df7c03c1dd2ecddaca43a40a5642969eff /lib
parenta5184806fb2ad44ea7dd898de73eaf1201a8f9fc (diff)
downloadgsoc2013-epiphany-e6945b6c75103866ac890219e93463ff4ce06183.tar
gsoc2013-epiphany-e6945b6c75103866ac890219e93463ff4ce06183.tar.gz
gsoc2013-epiphany-e6945b6c75103866ac890219e93463ff4ce06183.tar.bz2
gsoc2013-epiphany-e6945b6c75103866ac890219e93463ff4ce06183.tar.lz
gsoc2013-epiphany-e6945b6c75103866ac890219e93463ff4ce06183.tar.xz
gsoc2013-epiphany-e6945b6c75103866ac890219e93463ff4ce06183.tar.zst
gsoc2013-epiphany-e6945b6c75103866ac890219e93463ff4ce06183.zip
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
Diffstat (limited to 'lib')
-rw-r--r--lib/widgets/ephy-download-widget.c7
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);