From: Marco Pesenti Gritti <marco@gnome.org>
Date: Fri, 25 Feb 2005 12:10:25 +0000 (+0000)
Subject: Unescape filename for display
X-Git-Tag: EVINCE_0_1_5~6
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=f3e64159355661479db1232f45ccf75b8cbb23cc;p=evince.git

Unescape filename for display

2005-02-25  Marco Pesenti Gritti  <marco@gnome.org>

        * shell/ev-window.c: (update_window_title),
        (ev_window_popup_password_dialog):

        Unescape filename for display
---

diff --git a/ChangeLog b/ChangeLog
index fe81762f..30c9167a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-25  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* shell/ev-window.c: (update_window_title),
+	(ev_window_popup_password_dialog):
+
+	Unescape filename for display
+
 2005-02-25  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* pdf/xpdf/pdf-document.cc:
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 211c4460..4908b36d 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -53,6 +53,7 @@
 
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 
 #include <gconf/gconf-client.h>
@@ -452,7 +453,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
 	}
 
 	if (doc_title == NULL && ev_window->priv->uri) {
-		doc_title = g_path_get_basename (ev_window->priv->uri);
+		char *basename;
+
+		basename = g_path_get_basename (ev_window->priv->uri);
+		doc_title = gnome_vfs_unescape_string_for_display (basename);
+		g_free (basename);
 	}
 
 	if (password_needed) {
@@ -588,9 +593,10 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 
 	update_window_title (ev_window->priv->password_document, NULL, ev_window);
 	if (ev_window->priv->password_dialog == NULL) {
-		gchar *file_name;
+		gchar *basename, *file_name;
 
-		file_name = g_path_get_basename (ev_window->priv->password_uri);
+		basename = g_path_get_basename (ev_window->priv->password_uri);
+		file_name = gnome_vfs_unescape_string_for_display (basename);
 		ev_window->priv->password_dialog =
 			ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
 		g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
@@ -599,6 +605,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 				  "response",
 				  G_CALLBACK (password_dialog_response),
 				  ev_window);
+		g_free (basename);
 		g_free (file_name);
 		gtk_widget_show (ev_window->priv->password_dialog);
 	} else {