Updated translation

[evince.git] / pdf / ev-poppler.cc

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index 414bfb453fcd350a49613755bb8393763de413c3..dc5510e619841b08a1a10250db7577bb52147113 100644 (file)
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -34,6 +34,7 @@
 #include "ev-document-security.h"
 #include "ev-document-thumbnails.h"
 #include "ev-selection.h"
 #include "ev-document-security.h"
 #include "ev-document-thumbnails.h"
 #include "ev-selection.h"

+#include "ev-attachment.h"

 
 typedef struct {
        PdfDocument *document;
 
 typedef struct {
        PdfDocument *document;


@@ -79,8 +80,11 @@ static void pdf_document_thumbnails_get_dimensions      (EvDocumentThumbnails
                                                         gint                      *height);
 static int  pdf_document_get_n_pages                   (EvDocument                *document);
 
                                                         gint                      *height);
 static int  pdf_document_get_n_pages                   (EvDocument                *document);
 

-static EvLink * ev_link_from_action (PopplerAction *action);
-static void pdf_document_search_free (PdfDocumentSearch   *search);
+static EvLinkDest *ev_link_dest_from_dest   (PdfDocument       *pdf_document,
+                                            PopplerDest       *dest);
+static EvLink     *ev_link_from_action      (PdfDocument       *pdf_document,
+                                            PopplerAction     *action);
+static void        pdf_document_search_free (PdfDocumentSearch *search);

 
 
 G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
 
 
 G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,


@@ -132,8 +136,10 @@ pdf_document_search_free (PdfDocumentSearch   *search)
                g_list_foreach (search->pages[i], (GFunc) g_free, NULL);
                g_list_free (search->pages[i]);
        }
                g_list_foreach (search->pages[i], (GFunc) g_free, NULL);
                g_list_free (search->pages[i]);
        }

+       g_free (search->pages);

        
        

-        g_free (search->text);
+       g_free (search->text);
+       g_free (search);

 }
 
 static void
 }
 
 static void


@@ -275,45 +281,121 @@ pdf_document_get_page_label (EvDocument *document,
        return label;
 }
 
        return label;
 }
 

+static gboolean
+pdf_document_has_attachments (EvDocument *document)
+{
+       PdfDocument *pdf_document;
+
+       pdf_document = PDF_DOCUMENT (document);
+
+       return poppler_document_has_attachments (pdf_document->document);
+}
+
+struct SaveToBufferData {
+       gchar *buffer;
+       gsize len, max;
+};
+
+static gboolean
+attachment_save_to_buffer_callback (const gchar  *buf,
+                                   gsize         count,
+                                   gpointer      user_data,
+                                   GError      **error)
+{
+       struct SaveToBufferData *sdata = (SaveToBufferData *)user_data;
+       gchar *new_buffer;
+       gsize new_max;
+
+       if (sdata->len + count > sdata->max) {
+               new_max = MAX (sdata->max * 2, sdata->len + count);
+               new_buffer = (gchar *)g_realloc (sdata->buffer, new_max);
+
+               sdata->buffer = new_buffer;
+               sdata->max = new_max;
+       }
+       
+       memcpy (sdata->buffer + sdata->len, buf, count);
+       sdata->len += count;
+       
+       return TRUE;
+}
+
+static gboolean
+attachment_save_to_buffer (PopplerAttachment  *attachment,
+                          gchar             **buffer,
+                          gsize              *buffer_size,
+                          GError            **error)
+{
+       static const gint initial_max = 1024;
+       struct SaveToBufferData sdata;
+
+       *buffer = NULL;
+       *buffer_size = 0;
+
+       sdata.buffer = (gchar *) g_malloc (initial_max);
+       sdata.max = initial_max;
+       sdata.len = 0;
+
+       if (! poppler_attachment_save_to_callback (attachment,
+                                                  attachment_save_to_buffer_callback,
+                                                  &sdata,
+                                                  error)) {
+               g_free (sdata.buffer);
+               return FALSE;
+       }
+
+       *buffer = sdata.buffer;
+       *buffer_size = sdata.len;
+       
+       return TRUE;
+}
+

 static GList *
 static GList *

-pdf_document_get_links (EvDocument *document,
-                       int         page)
+pdf_document_get_attachments (EvDocument *document)

 {
        PdfDocument *pdf_document;
 {
        PdfDocument *pdf_document;

-       PopplerPage *poppler_page;
-       GList *retval = NULL;
-       GList *mapping_list;
+       GList *attachments;

        GList *list;
        GList *list;

-       double height;
+       GList *retval = NULL;

 
        pdf_document = PDF_DOCUMENT (document);
 
        pdf_document = PDF_DOCUMENT (document);

-       poppler_page = poppler_document_get_page (pdf_document->document,
-                                                 page);
-       mapping_list = poppler_page_get_link_mapping (poppler_page);
-       poppler_page_get_size (poppler_page, NULL, &height);

 
 

-       for (list = mapping_list; list; list = list->next) {
-               PopplerLinkMapping *link_mapping;
-               EvLinkMapping *ev_link_mapping;
+       if (!pdf_document_has_attachments (document))
+               return NULL;

 
 

-               link_mapping = (PopplerLinkMapping *)list->data;
-               ev_link_mapping = g_new (EvLinkMapping, 1);
-               ev_link_mapping->link = ev_link_from_action (link_mapping->action);
-               ev_link_mapping->x1 = link_mapping->area.x1;
-               ev_link_mapping->x2 = link_mapping->area.x2;
-               /* Invert this for X-style coordinates */
-               ev_link_mapping->y1 = height - link_mapping->area.y2;
-               ev_link_mapping->y2 = height - link_mapping->area.y1;
+       attachments = poppler_document_get_attachments (pdf_document->document);
+       
+       for (list = attachments; list; list = list->next) {
+               PopplerAttachment *attachment;
+               EvAttachment *ev_attachment;
+               gchar *data = NULL;
+               gsize size;
+               GError *error = NULL;
+
+               attachment = (PopplerAttachment *) list->data;
+
+               if (attachment_save_to_buffer (attachment, &data, &size, &error)) {
+                       ev_attachment = ev_attachment_new (attachment->name,
+                                                          attachment->description,
+                                                          attachment->mtime,
+                                                          attachment->ctime,
+                                                          size, data);
+                       
+                       retval = g_list_prepend (retval, ev_attachment);
+               } else {
+                       if (error) {
+                               g_warning ("%s", error->message);
+                               g_error_free (error);

 
 

-               retval = g_list_prepend (retval, ev_link_mapping);
-       }
+                               g_free (data);
+                       }
+               }

 
 

-       poppler_page_free_link_mapping (mapping_list);
-       g_object_unref (poppler_page);
+               g_object_unref (attachment);
+       }

 
        return g_list_reverse (retval);
 }
 
        return g_list_reverse (retval);
 }

-                       

 
 static GdkPixbuf *
 pdf_document_render_pixbuf (EvDocument   *document,
 
 static GdkPixbuf *
 pdf_document_render_pixbuf (EvDocument   *document,


@@ -550,7 +632,8 @@ pdf_document_document_iface_init (EvDocumentIface *iface)
        iface->get_n_pages = pdf_document_get_n_pages;
        iface->get_page_size = pdf_document_get_page_size;
        iface->get_page_label = pdf_document_get_page_label;
        iface->get_n_pages = pdf_document_get_n_pages;
        iface->get_page_size = pdf_document_get_page_size;
        iface->get_page_label = pdf_document_get_page_label;

-       iface->get_links = pdf_document_get_links;
+       iface->has_attachments = pdf_document_has_attachments;
+       iface->get_attachments = pdf_document_get_attachments;

        iface->render_pixbuf = pdf_document_render_pixbuf;
        iface->get_text = pdf_document_get_text;
        iface->can_get_text = pdf_document_can_get_text;
        iface->render_pixbuf = pdf_document_render_pixbuf;
        iface->get_text = pdf_document_get_text;
        iface->can_get_text = pdf_document_can_get_text;


@@ -608,24 +691,23 @@ pdf_document_fonts_scan (EvDocumentFonts *document_fonts,
 static const char *
 font_type_to_string (PopplerFontType type)
 {
 static const char *
 font_type_to_string (PopplerFontType type)
 {

-       switch (type)
-       {
-       case POPPLER_FONT_TYPE_TYPE1:
-               return _("Type 1");
-       case POPPLER_FONT_TYPE_TYPE1C:
-               return _("Type 1C");
-       case POPPLER_FONT_TYPE_TYPE3:
-               return _("Type 3");
-       case POPPLER_FONT_TYPE_TRUETYPE:
-               return _("TrueType");
-       case POPPLER_FONT_TYPE_CID_TYPE0:
-               return _("Type 1 (CID)");
-       case POPPLER_FONT_TYPE_CID_TYPE0C:
-               return _("Type 1C (CID)");
-       case POPPLER_FONT_TYPE_CID_TYPE2:
-               return _("TrueType (CID)");
-       default:
-               return _("Unknown font type");
+       switch (type) {
+               case POPPLER_FONT_TYPE_TYPE1:
+                       return _("Type 1");
+               case POPPLER_FONT_TYPE_TYPE1C:
+                       return _("Type 1C");
+               case POPPLER_FONT_TYPE_TYPE3:
+                       return _("Type 3");
+               case POPPLER_FONT_TYPE_TRUETYPE:
+                       return _("TrueType");
+               case POPPLER_FONT_TYPE_CID_TYPE0:
+                       return _("Type 1 (CID)");
+               case POPPLER_FONT_TYPE_CID_TYPE0C:
+                       return _("Type 1C (CID)");
+               case POPPLER_FONT_TYPE_CID_TYPE2:
+                       return _("TrueType (CID)");
+               default:
+                       return _("Unknown font type");

        }
 }
 
        }
 }
 


@@ -702,100 +784,143 @@ pdf_document_links_has_document_links (EvDocumentLinks *document_links)
        return TRUE;
 }
 
        return TRUE;
 }
 

-static EvLink *
-ev_link_from_dest (PopplerAction *action)
+static EvLinkDest *
+ev_link_dest_from_dest (PdfDocument *pdf_document,
+                       PopplerDest *dest)

 {
 {

-       EvLink *link = NULL;
+       EvLinkDest *ev_dest = NULL;

        const char *unimplemented_dest = NULL;
 
        const char *unimplemented_dest = NULL;
 

-       switch (action->goto_dest.dest->type) {
-       case POPPLER_DEST_UNKNOWN:
-               unimplemented_dest = "POPPLER_DEST_UNKNOWN";
-               break;
-       case POPPLER_DEST_XYZ:
-               link = ev_link_new_page_xyz (action->any.title,
-                                            action->goto_dest.dest->page_num - 1,
-                                            action->goto_dest.dest->left,
-                                            action->goto_dest.dest->top,
-                                            action->goto_dest.dest->zoom);
-               break;
-       case POPPLER_DEST_FIT:
-               unimplemented_dest = "POPPLER_DEST_FIT";
-               break;
-       case POPPLER_DEST_FITH:
-               unimplemented_dest = "POPPLER_DEST_FITH";
-               break;
-       case POPPLER_DEST_FITV:
-               unimplemented_dest = "POPPLER_DEST_FITV";
-               break;
-       case POPPLER_DEST_FITR:
-               unimplemented_dest = "POPPLER_DEST_FITR";
-               break;
-       case POPPLER_DEST_FITB:
-               unimplemented_dest = "POPPLER_DEST_FITB";
-               break;
-       case POPPLER_DEST_FITBH:
-               unimplemented_dest = "POPPLER_DEST_FITBH";
-               break;
-       case POPPLER_DEST_FITBV:
-               unimplemented_dest = "POPPLER_DEST_FITBV";
-               break;
+       g_assert (dest != NULL);
+
+       switch (dest->type) {
+               case POPPLER_DEST_XYZ: {
+                       PopplerPage *poppler_page;
+                       double height;
+
+                       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                                 MAX (0, dest->page_num - 1));
+                       poppler_page_get_size (poppler_page, NULL, &height);
+                       ev_dest = ev_link_dest_new_xyz (dest->page_num - 1,
+                                                       dest->left,
+                                                       height - dest->top,
+                                                       dest->zoom);
+                       g_object_unref (poppler_page);
+               }
+                       break;
+               case POPPLER_DEST_FIT:
+                       ev_dest = ev_link_dest_new_fit (dest->page_num - 1);
+                       break;
+               case POPPLER_DEST_FITH: {
+                       PopplerPage *poppler_page;
+                       double height;
+
+                       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                                 MAX (0, dest->page_num - 1));
+                       poppler_page_get_size (poppler_page, NULL, &height);
+                       ev_dest = ev_link_dest_new_fith (dest->page_num - 1,
+                                                        height - dest->top);
+                       g_object_unref (poppler_page);
+               }
+                       break;
+               case POPPLER_DEST_FITV:
+                       ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
+                                                        dest->left);
+                       break;
+               case POPPLER_DEST_FITR: {
+                       PopplerPage *poppler_page;
+                       double height;
+
+                       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                                 MAX (0, dest->page_num - 1));
+                       poppler_page_get_size (poppler_page, NULL, &height);
+                       ev_dest = ev_link_dest_new_fitr (dest->page_num - 1,
+                                                        dest->left,
+                                                        height - dest->bottom,
+                                                        dest->right,
+                                                        height - dest->top);
+                       g_object_unref (poppler_page);
+               }
+                       break;
+               case POPPLER_DEST_FITB:
+                       unimplemented_dest = "POPPLER_DEST_FITB";
+                       break;
+               case POPPLER_DEST_FITBH:
+                       unimplemented_dest = "POPPLER_DEST_FITBH";
+                       break;
+               case POPPLER_DEST_FITBV:
+                       unimplemented_dest = "POPPLER_DEST_FITBV";
+                       break;
+               case POPPLER_DEST_NAMED:
+                       ev_dest = ev_link_dest_new_named (dest->named_dest);
+                       break;
+               case POPPLER_DEST_UNKNOWN:
+                       unimplemented_dest = "POPPLER_DEST_UNKNOWN";
+                       break;

        }
 
        if (unimplemented_dest) {
        }
 
        if (unimplemented_dest) {

-               g_warning ("Unimplemented destination: %s, please post a bug report with a testcase.",
+               g_warning ("Unimplemented named action: %s, please post a "
+                          "bug report in Evince bugzilla "
+                          "(http://bugzilla.gnome.org) with a testcase.",

                           unimplemented_dest);
        }
 
                           unimplemented_dest);
        }
 

-       if (link == NULL) {
-               link = ev_link_new_page (action->any.title, action->goto_dest.dest->page_num - 1);
-       }
-
-       return link;
+       if (!ev_dest)
+               ev_dest = ev_link_dest_new_page (dest->page_num - 1);
+       
+       return ev_dest;

 }
 
 static EvLink *
 }
 
 static EvLink *

-ev_link_from_action (PopplerAction *action)
+ev_link_from_action (PdfDocument   *pdf_document,
+                    PopplerAction *action)

 {
 {

-       EvLink *link = NULL;
-       const char *title;
-       const char *unimplemented_action = NULL;
-
-       title = action->any.title;
+       EvLink       *link = NULL;
+       EvLinkAction *ev_action = NULL;
+       const char   *unimplemented_action = NULL;

 
        switch (action->type) {
 
        switch (action->type) {

-       case POPPLER_ACTION_UNKNOWN:
-               g_warning ("Unknown action"); 
-               break;
-       case POPPLER_ACTION_GOTO_DEST:
-               link = ev_link_from_dest (action);
-               break;
-       case POPPLER_ACTION_GOTO_REMOTE:
-               unimplemented_action = "POPPLER_ACTION_GOTO_REMOTE";
-               break;
-       case POPPLER_ACTION_LAUNCH:
-               unimplemented_action = "POPPLER_ACTION_LAUNCH";
-               break;
-       case POPPLER_ACTION_URI:
-               link = ev_link_new_external (title, action->uri.uri);
-               break;
-       case POPPLER_ACTION_NAMED:
-               unimplemented_action = "POPPLER_ACTION_NAMED";
-               break;
-       case POPPLER_ACTION_MOVIE:
-               unimplemented_action = "POPPLER_ACTION_MOVIE";
-               break;
+               case POPPLER_ACTION_GOTO_DEST: {
+                       EvLinkDest *dest;
+                       
+                       dest = ev_link_dest_from_dest (pdf_document, action->goto_dest.dest);
+                       ev_action = ev_link_action_new_dest (dest);
+               }
+                       break;
+               case POPPLER_ACTION_GOTO_REMOTE: {
+                       EvLinkDest *dest;
+                       
+                       dest = ev_link_dest_from_dest (pdf_document, action->goto_remote.dest);
+                       ev_action = ev_link_action_new_remote (dest, 
+                                                              action->goto_remote.file_name);
+                       
+               }
+                       break;
+               case POPPLER_ACTION_LAUNCH:
+                       ev_action = ev_link_action_new_launch (action->launch.file_name,
+                                                              action->launch.params);
+                       break;
+               case POPPLER_ACTION_URI:
+                       ev_action = ev_link_action_new_external_uri (action->uri.uri);
+                       break;
+               case POPPLER_ACTION_NAMED:
+                       ev_action = ev_link_action_new_named (action->named.named_dest);
+                       break;
+               case POPPLER_ACTION_MOVIE:
+                       unimplemented_action = "POPPLER_ACTION_MOVIE";
+                       break;
+               case POPPLER_ACTION_UNKNOWN:
+                       unimplemented_action = "POPPLER_ACTION_UNKNOWN";

        }
        }

-
+       

        if (unimplemented_action) {
                g_warning ("Unimplemented action: %s, please post a bug report with a testcase.",
                           unimplemented_action);
        }
        if (unimplemented_action) {
                g_warning ("Unimplemented action: %s, please post a bug report with a testcase.",
                           unimplemented_action);
        }

-
-       if (link == NULL) {
-               link = ev_link_new_title (title);
-       }
-
+       
+       link = ev_link_new (action->any.title, ev_action);
+       

        return link;    
 }
 
        return link;    
 }
 


@@ -805,43 +930,84 @@ build_tree (PdfDocument      *pdf_document,
            GtkTreeIter      *parent,
            PopplerIndexIter *iter)
 {
            GtkTreeIter      *parent,
            PopplerIndexIter *iter)
 {

-
+       

        do {
                GtkTreeIter tree_iter;
                PopplerIndexIter *child;
                PopplerAction *action;
        do {
                GtkTreeIter tree_iter;
                PopplerIndexIter *child;
                PopplerAction *action;

-               EvLink *link;
+               EvLink *link = NULL;

                gboolean expand;
                gboolean expand;

+               char *title_markup;

                
                action = poppler_index_iter_get_action (iter);
                expand = poppler_index_iter_is_open (iter);
                
                action = poppler_index_iter_get_action (iter);
                expand = poppler_index_iter_is_open (iter);

-               if (action) {
-                       gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent);
-                       link = ev_link_from_action (action);
-                       poppler_action_free (action);

 
 

-                       gtk_tree_store_set (GTK_TREE_STORE (model), &tree_iter,
-                                           EV_DOCUMENT_LINKS_COLUMN_MARKUP, ev_link_get_title (link),
-                                           EV_DOCUMENT_LINKS_COLUMN_LINK, link,
-                                           EV_DOCUMENT_LINKS_COLUMN_EXPAND, expand,
-                                           -1);
-                       g_object_unref (link);
-                       child = poppler_index_iter_get_child (iter);
-                       if (child)
-                               build_tree (pdf_document, model, &tree_iter, child);
-                       poppler_index_iter_free (child);
+               if (!action)
+                       continue;
+
+               switch (action->type) {
+                       case POPPLER_ACTION_GOTO_DEST: {
+                               /* For bookmarks, solve named destinations */
+                               if (action->goto_dest.dest->type == POPPLER_DEST_NAMED) {
+                                       PopplerDest *dest;
+                                       EvLinkDest *ev_dest = NULL;
+                                       EvLinkAction *ev_action;
+                                       
+                                       dest = poppler_document_find_dest (pdf_document->document,
+                                                                          action->goto_dest.dest->named_dest);
+                                       if (!dest) {
+                                               link = ev_link_from_action (pdf_document, action);
+                                               break;
+                                       }
+                                       
+                                       ev_dest = ev_link_dest_from_dest (pdf_document, dest);
+                                       poppler_dest_free (dest);
+                                       
+                                       ev_action = ev_link_action_new_dest (ev_dest);
+                                       link = ev_link_new (action->any.title, ev_action);
+                               } else {
+                                       link = ev_link_from_action (pdf_document, action);
+                               }
+                       }
+                               break;
+                       default:
+                               link = ev_link_from_action (pdf_document, action);
+                               break;

                }
                }

+               
+               if (!link) {
+                       poppler_action_free (action);
+                       continue;
+               }
+
+               gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent);
+               title_markup = g_markup_escape_text (ev_link_get_title (link), -1);
+               
+               gtk_tree_store_set (GTK_TREE_STORE (model), &tree_iter,
+                                   EV_DOCUMENT_LINKS_COLUMN_MARKUP, title_markup,
+                                   EV_DOCUMENT_LINKS_COLUMN_LINK, link,
+                                   EV_DOCUMENT_LINKS_COLUMN_EXPAND, expand,
+                                   -1);
+               
+               g_free (title_markup);
+               g_object_unref (link);
+               
+               child = poppler_index_iter_get_child (iter);
+               if (child)
+                       build_tree (pdf_document, model, &tree_iter, child);
+               poppler_index_iter_free (child);
+               poppler_action_free (action);
+               

        } while (poppler_index_iter_next (iter));
 }
 
        } while (poppler_index_iter_next (iter));
 }
 

-

 static GtkTreeModel *
 pdf_document_links_get_links_model (EvDocumentLinks *document_links)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (document_links);
        GtkTreeModel *model = NULL;
        PopplerIndexIter *iter;
 static GtkTreeModel *
 pdf_document_links_get_links_model (EvDocumentLinks *document_links)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT (document_links);
        GtkTreeModel *model = NULL;
        PopplerIndexIter *iter;

-
+       

        g_return_val_if_fail (PDF_IS_DOCUMENT (document_links), NULL);
 
        iter = poppler_index_iter_new (pdf_document->document);
        g_return_val_if_fail (PDF_IS_DOCUMENT (document_links), NULL);
 
        iter = poppler_index_iter_new (pdf_document->document);


@@ -858,22 +1024,82 @@ pdf_document_links_get_links_model (EvDocumentLinks *document_links)
        return model;
 }
 
        return model;
 }
 

+static GList *
+pdf_document_links_get_links (EvDocumentLinks *document_links,
+                             gint             page)
+{
+       PdfDocument *pdf_document;
+       PopplerPage *poppler_page;
+       GList *retval = NULL;
+       GList *mapping_list;
+       GList *list;
+       double height;
+
+       pdf_document = PDF_DOCUMENT (document_links);
+       poppler_page = poppler_document_get_page (pdf_document->document,
+                                                 page);
+       mapping_list = poppler_page_get_link_mapping (poppler_page);
+       poppler_page_get_size (poppler_page, NULL, &height);
+
+       for (list = mapping_list; list; list = list->next) {
+               PopplerLinkMapping *link_mapping;
+               EvLinkMapping *ev_link_mapping;
+
+               link_mapping = (PopplerLinkMapping *)list->data;
+               ev_link_mapping = g_new (EvLinkMapping, 1);
+               ev_link_mapping->link = ev_link_from_action (pdf_document,
+                                                            link_mapping->action);
+               ev_link_mapping->x1 = link_mapping->area.x1;
+               ev_link_mapping->x2 = link_mapping->area.x2;
+               /* Invert this for X-style coordinates */
+               ev_link_mapping->y1 = height - link_mapping->area.y2;
+               ev_link_mapping->y2 = height - link_mapping->area.y1;
+
+               retval = g_list_prepend (retval, ev_link_mapping);
+       }
+
+       poppler_page_free_link_mapping (mapping_list);
+       g_object_unref (poppler_page);
+
+       return g_list_reverse (retval);
+}
+
+static EvLinkDest *
+pdf_document_links_find_link_dest (EvDocumentLinks  *document_links,
+                                  const gchar      *link_name)
+{
+       PdfDocument *pdf_document;
+       PopplerDest *dest;
+       EvLinkDest *ev_dest = NULL;
+
+       pdf_document = PDF_DOCUMENT (document_links);
+       dest = poppler_document_find_dest (pdf_document->document,
+                                          link_name);
+       if (dest) {
+               ev_dest = ev_link_dest_from_dest (pdf_document, dest);
+               poppler_dest_free (dest);
+       }
+
+       return ev_dest;
+}
+

 static void
 pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 {
        iface->has_document_links = pdf_document_links_has_document_links;
        iface->get_links_model = pdf_document_links_get_links_model;
 static void
 pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 {
        iface->has_document_links = pdf_document_links_has_document_links;
        iface->get_links_model = pdf_document_links_get_links_model;

+       iface->get_links = pdf_document_links_get_links;
+       iface->find_link_dest = pdf_document_links_find_link_dest;

 }
 
 static GdkPixbuf *
 make_thumbnail_for_size (PdfDocument   *pdf_document,
                         gint           page,
                         int            rotation,
 }
 
 static GdkPixbuf *
 make_thumbnail_for_size (PdfDocument   *pdf_document,
                         gint           page,
                         int            rotation,

-                        gint           size,
-                        gboolean       border)
+                        gint           size)

 {
        PopplerPage *poppler_page;
 {
        PopplerPage *poppler_page;

-       GdkPixbuf *pixbuf, *sub_pixbuf;
+       GdkPixbuf *pixbuf;

        int width, height;
        double scale;
        gdouble unscaled_width, unscaled_height;
        int width, height;
        double scale;
        gdouble unscaled_width, unscaled_height;


@@ -886,38 +1112,25 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
        poppler_page_get_size (poppler_page, &unscaled_width, &unscaled_height);
        scale = width / unscaled_width;
 
        poppler_page_get_size (poppler_page, &unscaled_width, &unscaled_height);
        scale = width / unscaled_width;
 

-       if (border) {
-               pixbuf = ev_document_misc_get_thumbnail_frame (width, height, rotation, NULL);
-
-               width = gdk_pixbuf_get_width (pixbuf);
-               height = gdk_pixbuf_get_height (pixbuf);
-               sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf,
-                                                      1, 1,
-                                                      width - 1, height - 1);
-       } else {
-               /* rotate */
-               if (rotation == 90 || rotation == 270) {
-                       int temp;
-                       temp = width;
-                       width = height;
-                       height = temp;
-               }
-
-               pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-                                        width, height);
-               gdk_pixbuf_fill (pixbuf, 0xffffffff);
-               sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf,
-                                                      0, 0,
-                                                      width, height);
+       /* rotate */
+       if (rotation == 90 || rotation == 270) {
+               int temp;
+               temp = width;
+               width = height;
+               height = temp;

        }
 
        }
 

+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+                                width, height);
+       gdk_pixbuf_fill (pixbuf, 0xffffffff);
+

        poppler_page_render_to_pixbuf (poppler_page, 0, 0,
                                       width, height,
        poppler_page_render_to_pixbuf (poppler_page, 0, 0,
                                       width, height,

-                                      scale, rotation, sub_pixbuf);
-
-       g_object_unref (G_OBJECT (sub_pixbuf));
+                                      scale, rotation, pixbuf);
+       

 
        g_object_unref (poppler_page);
 
        g_object_unref (poppler_page);

+

        return pixbuf;
 }
 
        return pixbuf;
 }
 


@@ -926,11 +1139,12 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
                                       gint                  page,
                                       gint                  rotation,
                                       gint                  size,
                                       gint                  page,
                                       gint                  rotation,
                                       gint                  size,

-                                      gboolean              border)
+                                      gboolean              border)

 {
        PdfDocument *pdf_document;
        PopplerPage *poppler_page;
        GdkPixbuf *pixbuf;
 {
        PdfDocument *pdf_document;
        PopplerPage *poppler_page;
        GdkPixbuf *pixbuf;

+       GdkPixbuf *border_pixbuf;

 
        pdf_document = PDF_DOCUMENT (document_thumbnails);
 
 
        pdf_document = PDF_DOCUMENT (document_thumbnails);
 


@@ -939,20 +1153,17 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
 
        pixbuf = poppler_page_get_thumbnail (poppler_page);
        
 
        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. */
                /* 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;
        g_object_unref (poppler_page);
        
        return pixbuf;


@@ -982,13 +1193,8 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail
                double page_width, page_height;
 
                poppler_page_get_size (poppler_page, &page_width, &page_height);
                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);
 }
        }
        g_object_unref (poppler_page);
 }


@@ -1055,10 +1261,6 @@ pdf_document_search_new (PdfDocument *pdf_document,
 
        search->text = g_strdup (text);
         search->pages = g_new0 (GList *, n_pages);
 
        search->text = g_strdup (text);
         search->pages = g_new0 (GList *, n_pages);

-       for (i = 0; i < n_pages; i++) {
-               search->pages[i] = NULL;
-       }
-

         search->document = pdf_document;
 
         /* We add at low priority so the progress bar repaints */
         search->document = pdf_document;
 
         /* We add at low priority so the progress bar repaints */


@@ -1147,9 +1349,7 @@ pdf_document_find_page_has_results (EvDocumentFind *document_find,
 {
        PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search;
 
 {
        PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search;
 

-       g_return_val_if_fail (search != NULL, FALSE);
-
-       return search->pages[page] != NULL;
+       return search && search->pages[page] != NULL;

 }
 
 double
 }
 
 double