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 fe81762f545196b68f5587f277e185463ecd3b00..30c9167a0f9e891e61b9c8317cccbe6ae4dfd244 100644 (file)
--- 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 211c44602437bdf003306642e4e5ac7c5bbacdb7..4908b36da519d454ea3c29719aacc28a9b626a99 100644 (file)
--- 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 {