X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window-title.c;h=3a7d908dafeb99fec468421fc2e310eaa6cf1f4d;hb=b4400b84fbb899a1984c8e145b91a09de3a35516;hp=45e10ae77659a41983be998d949cfa0bc0438e49;hpb=74e72e5fe94b080c975203c893d38353fd2e0db4;p=evince.git

diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
index 45e10ae7..3a7d908d 100644
--- a/shell/ev-window-title.c
+++ b/shell/ev-window-title.c
@@ -40,6 +40,7 @@ struct _EvWindowTitle
 static const BadExtensionEntry bad_extensions[] = {
 	{ EV_BACKEND_PS, ".dvi" },
 	{ EV_BACKEND_PDF, ".doc" },
+	{ EV_BACKEND_PDF, ".dvi" },
 	{ EV_BACKEND_PDF, ".indd" },
 	{ EV_BACKEND_PDF, ".rtf" }
 };
@@ -117,14 +118,12 @@ ev_window_title_update (EvWindowTitle *window_title)
 		}
 	}
 
-	if (title) {
+	if (title && window_title->uri) {
 		ev_window_title_sanitize_extension (window_title, &title);
-	} else {
-		if (window_title->uri) {
-			title = get_filename_from_uri (window_title->uri);
-		} else {
-			title = g_strdup (_("Document Viewer"));
-		}
+	} else if (window_title->uri) {
+		title = get_filename_from_uri (window_title->uri);
+	} else if (!title) {
+		title = g_strdup (_("Document Viewer"));
 	}
 
 	for (p = title; *p; ++p) {
@@ -142,6 +141,8 @@ ev_window_title_update (EvWindowTitle *window_title)
 		g_free (password_title);
 		break;
 	}
+
+	g_free (title);
 }
 
 void