X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-window-title.c;h=ca2429b5656b6edb563e74dde5a80d2d9957c9ca;hb=1600e0323e398d2e235121e9e25df70853095e4c;hp=baafa74f399278d607418375085c43efb0c1d0d0;hpb=28ffb1e81e22421674091f6ad73613684bad12de;p=evince.git diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c index baafa74f..ca2429b5 100644 --- a/shell/ev-window-title.c +++ b/shell/ev-window-title.c @@ -75,7 +75,7 @@ get_filename_from_uri (const char *uri) char *filename; char *basename; - filename = escape_uri_for_display (uri); + filename = g_uri_unescape_string (uri, NULL); basename = g_path_get_basename (filename); g_free(filename); @@ -122,14 +122,11 @@ ev_window_title_update (EvWindowTitle *window_title) { GtkWindow *window = GTK_WINDOW (window_title->window); char *title = NULL, *password_title, *p; - EvPageCache *page_cache; if (window_title->document != NULL) { - char *doc_title; + gchar *doc_title; - page_cache = ev_page_cache_get (window_title->document); - g_return_if_fail (page_cache != NULL); - doc_title = (char *)ev_page_cache_get_title (page_cache); + doc_title = g_strdup (ev_document_get_title (window_title->document)); /* Make sure we get a valid title back */ if (doc_title != NULL) { @@ -139,6 +136,8 @@ ev_window_title_update (EvWindowTitle *window_title) g_utf8_validate (doc_title, -1, NULL)) { title = g_strdup (doc_title); } + + g_free (doc_title); } }