Thumnail dimensions unified with other backends.

	* pdf/ev-poppler.cc:

	Thumnail dimensions unified with other backends.

	* shell/ev-window-title.c: (ev_window_title_update):

	Fix warning.

diff --git a/ChangeLog b/ChangeLog
index 5e0dfe904a3cc48e21cf9f5d81628af85ac2f5a5..ac6f71612d2c836275c535f3c4ce1d8ab6248a79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-18  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * pdf/ev-poppler.cc:
+       
+       Thumnail dimensions unified with other backends.
+       
+       * shell/ev-window-title.c: (ev_window_title_update):
+       
+       Fix warning.
+
 2005-10-17  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * data/ev-stock-zoom-fit-width.png:

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index 6e1d2d16b181586667dd1c614e91d349d6235bf9..417e1aedd9e73d357809feba833d682fc5ba06bf 100644 (file)
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -886,11 +886,10 @@ static GdkPixbuf *
 make_thumbnail_for_size (PdfDocument   *pdf_document,
                         gint           page,
                         int            rotation,
-                        gint           size,
-                        gboolean       border)
+                        gint           size)
 {
        PopplerPage *poppler_page;
-       GdkPixbuf *pixbuf, *border_pixbuf;
+       GdkPixbuf *pixbuf;
        int width, height;
        double scale;
        gdouble unscaled_width, unscaled_height;
@@ -919,11 +918,6 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
                                       width, height,
                                       scale, rotation, pixbuf);
        
-        if (border) {          
-               border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
-               g_object_unref (pixbuf);
-               pixbuf = border_pixbuf;
-       }               
 
        g_object_unref (poppler_page);
 
@@ -935,11 +929,12 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
                                       gint                  page,
                                       gint                  rotation,
                                       gint                  size,
-                                      gboolean              border)
+                                      gboolean              border)
 {
        PdfDocument *pdf_document;
        PopplerPage *poppler_page;
        GdkPixbuf *pixbuf;
+       GdkPixbuf *border_pixbuf;
 
        pdf_document = PDF_DOCUMENT (document_thumbnails);
 
@@ -948,20 +943,17 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
 
        pixbuf = poppler_page_get_thumbnail (poppler_page);
        
-       if (pixbuf != NULL) {
-               /* The document provides its own thumbnails. */
-               if (border) {
-                       GdkPixbuf *real_pixbuf;
-
-                       real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
-                       g_object_unref (pixbuf);
-                       pixbuf = real_pixbuf;
-               }
-       } else {
+       if (pixbuf == NULL) {
                /* There is no provided thumbnail.  We need to make one. */
-               pixbuf = make_thumbnail_for_size (pdf_document, page, rotation, size, border);
+               pixbuf = make_thumbnail_for_size (pdf_document, page, rotation, size);
        }
 
+        if (border) {          
+               border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
+               g_object_unref (pixbuf);
+               pixbuf = border_pixbuf;
+       }               
+
        g_object_unref (poppler_page);
        
        return pixbuf;
@@ -991,13 +983,8 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                double page_width, page_height;
 
                poppler_page_get_size (poppler_page, &page_width, &page_height);
-               if (page_width > page_height) {
-                       *width = size;
-                       *height = (int) (size * page_height / page_width);
-               } else {
-                       *width = (int) (size * page_width / page_height);
-                       *height = size;
-               }
+               *width = size;
+               *height = (int) (size * page_height / page_width);
        }
        g_object_unref (poppler_page);
 }

diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
index 45e10ae77659a41983be998d949cfa0bc0438e49..64508e000362ad9e235f507df1540408c6961a23 100644 (file)
--- a/shell/ev-window-title.c
+++ b/shell/ev-window-title.c
@@ -117,7 +117,7 @@ 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) {