From a5c289563df30337b5321e72ddfc48c5f905a3ac Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Sun, 17 Apr 2005 14:35:12 +0000
Subject: Move library dependencies to components.

        * djvu/Makefile.am:
        * dvi/Makefile.am:
        * shell/Makefile.am:

        Move library dependencies to components.

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

        Fix display of uris with spaces. Bug 168358.
---------------------------------------------------------------------
---
(limited to 'shell')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index b03eed4..629e89d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -66,8 +66,6 @@ evince_LDADD=							\
 
 if ENABLE_DJVU
 evince_LDADD += 				\
-	-ldjvulibre 				\
-	-lpthread   				\
 	$(top_builddir)/djvu/libgtkdjvu.la	\
 	$(NULL)
 endif
@@ -78,10 +76,6 @@ evince_LDADD += 				\
 	$(NULL)
 endif
 
-if WITH_TYPE1_FONTS
-evince_LDADD += -lt1lib
-endif
-
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
 EXTRA_DIST = ev-marshal.list
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 43a0403..ec17680 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -444,7 +444,7 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
 	gboolean password_needed;
 
 	password_needed = (ev_window->priv->password_document != NULL);
-	if (document) {
+	if (document && ev_window->priv->page_cache) {
 		doc_title = ev_page_cache_get_title (ev_window->priv->page_cache);
 
 		/* Make sure we get a valid title back */
@@ -686,15 +686,18 @@ start_loading_document (EvWindow   *ev_window,
 
 	if (error->domain == EV_DOCUMENT_ERROR &&
 	    error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
-		char *file_name;
+		gchar *base_name, *file_name;
 
 		ev_window->priv->password_document = g_object_ref (document);
 		ev_window->priv->password_uri = g_strdup (uri);
 
-		file_name = g_path_get_basename (uri);
+		base_name = g_path_get_basename (uri);
+		file_name = gnome_vfs_unescape_string_for_display (base_name);
+
 		ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
 						file_name);
 		g_free (file_name);
+		g_free (base_name);
 		ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
 
 		ev_window_popup_password_dialog (ev_window);
--
cgit v0.9.1