X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libdocument%2Fev-document-links.c;h=b8dc1f23fff91d04db72c902e70641635b434bcd;hb=212d9a536bc60e711b779feb5e8aa33db654997d;hp=7b31c4d4173458c9d534fd9b2cbc2f90e7b18284;hpb=837897ffba5a5e4e5685c1ffdeb1d4d87083a052;p=evince.git

diff --git a/libdocument/ev-document-links.c b/libdocument/ev-document-links.c
index 7b31c4d4..b8dc1f23 100644
--- a/libdocument/ev-document-links.c
+++ b/libdocument/ev-document-links.c
@@ -54,16 +54,13 @@ ev_document_links_get_links_model (EvDocumentLinks *document_links)
 	return retval;
 }
 
-GList *
+EvMappingList *
 ev_document_links_get_links (EvDocumentLinks *document_links,
 			     EvPage          *page)
 {
 	EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
-	GList *retval;
 
-	retval = iface->get_links (document_links, page);
-
-	return retval;
+	return iface->get_links (document_links, page);
 }
 
 EvLinkDest *
@@ -80,6 +77,20 @@ ev_document_links_find_link_dest (EvDocumentLinks *document_links,
 	return retval;
 }
 
+gint
+ev_document_links_find_link_page (EvDocumentLinks *document_links,
+				  const gchar     *link_name)
+{
+	EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
+	gint retval;
+
+	ev_document_doc_mutex_lock ();
+	retval = iface->find_link_page (document_links, link_name);
+	ev_document_doc_mutex_unlock ();
+
+	return retval;
+}
+
 /* Helper functions */
 gint
 ev_document_links_get_dest_page (EvDocumentLinks *document_links,
@@ -89,14 +100,8 @@ ev_document_links_get_dest_page (EvDocumentLinks *document_links,
 
 	switch (ev_link_dest_get_dest_type (dest)) {
 	case EV_LINK_DEST_TYPE_NAMED: {
-		EvLinkDest *dest2;
-
-		dest2 = ev_document_links_find_link_dest (document_links,
-							  ev_link_dest_get_named_dest (dest));
-		if (dest2) {
-			page = ev_link_dest_get_page (dest2);
-			g_object_unref (dest2);
-		}
+		page = ev_document_links_find_link_page (document_links,
+							 ev_link_dest_get_named_dest (dest));
 	}
 		break;
 	case EV_LINK_DEST_TYPE_PAGE_LABEL:
@@ -130,3 +135,41 @@ ev_document_links_get_dest_page_label (EvDocumentLinks *document_links,
 
 	return label;
 }
+
+static EvLinkDest *
+get_link_dest (EvLink *link)
+{
+	EvLinkAction *action;
+
+	action = ev_link_get_action (link);
+	if (!action)
+		return NULL;
+
+	if (ev_link_action_get_action_type (action) !=
+	    EV_LINK_ACTION_TYPE_GOTO_DEST)
+		return NULL;
+
+	return ev_link_action_get_dest (action);
+}
+
+gint
+ev_document_links_get_link_page (EvDocumentLinks *document_links,
+				 EvLink          *link)
+{
+	EvLinkDest *dest;
+
+	dest = get_link_dest (link);
+
+	return dest ? ev_document_links_get_dest_page (document_links, dest) : -1;
+}
+
+gchar *
+ev_document_links_get_link_page_label (EvDocumentLinks *document_links,
+				       EvLink          *link)
+{
+	EvLinkDest *dest;
+
+	dest = get_link_dest (link);
+
+	return dest ? ev_document_links_get_dest_page_label (document_links, dest) : NULL;
+}