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.
---------------------------------------------------------------------

diff --git a/ChangeLog b/ChangeLog
index 921313bafc6057abc7c00d860d08f17b168db8b6..633df221736b5f858f03fd6013df280087099adb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-04-17  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * 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.
+
 Sat Apr 16 18:53:47 2005  Jonathan Blandford  <jrb@redhat.com>
 
        * shell/ev-sidebar-links.c: (selection_changed_cb):

diff --git a/djvu/Makefile.am b/djvu/Makefile.am
index 29aa06bd0ec5948a47f9780c0cd33994a5eb18e1..a82f5b86e61d0b71002011076065a97057d92dd4 100644 (file)
--- a/djvu/Makefile.am
+++ b/djvu/Makefile.am
@@ -10,3 +10,7 @@ noinst_LTLIBRARIES = libgtkdjvu.la
 libgtkdjvu_la_SOURCES = \
        djvu-document.c \
        djvu-document.h
+
+libgtkdjvu_la_LIBADD = -lpthread -ldjvulibre
+
+

diff --git a/dvi/Makefile.am b/dvi/Makefile.am
index 4e025bddb9d8f4f7aa0f3118a1a4fa4eb3c79622..a706f178bf51273b80bdcc9e28552dc752bc4079 100644 (file)
--- a/dvi/Makefile.am
+++ b/dvi/Makefile.am
@@ -20,6 +20,10 @@ libgtkdvi_la_SOURCES = \
 libgtkdvi_la_LIBADD = mdvi-lib/libmdvi.la      \
        $(DVI_LIBS) -lkpathsea
 
+if WITH_TYPE1_FONTS
+libgtkdvi_la_LIBADD += -lt1lib
+endif
+
 
 
 

diff --git a/shell/Makefile.am b/shell/Makefile.am
index b03eed4b8dbbccef21fd69d0ed2b8fee391a415e..629e89d35504cf2a4c1ba06d67d1a643e5623897 100644 (file)
--- 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 43a040322b1911b0075c302988edf47ca8f4c203..ec17680d18e50ec0c3e12cf8badbc2aec369f759 100644 (file)
--- 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);