[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / libdocument / ev-document-links.c

diff --git a/libdocument/ev-document-links.c b/libdocument/ev-document-links.c
index 16e0d9a84927cea411dd1612b67b958051d254ef..b8dc1f23fff91d04db72c902e70641635b434bcd 100644 (file)
--- a/libdocument/ev-document-links.c
+++ b/libdocument/ev-document-links.c
@@ -25,17 +25,17 @@
 
 #include "ev-document-links.h"
 
-EV_DEFINE_INTERFACE (EvDocumentLinks, ev_document_links, 0)
+G_DEFINE_INTERFACE (EvDocumentLinks, ev_document_links, 0)
 
 static void
-ev_document_links_class_init (EvDocumentLinksIface *klass)
+ev_document_links_default_init (EvDocumentLinksInterface *klass)
 {
 }
 
 gboolean
 ev_document_links_has_document_links (EvDocumentLinks *document_links)
 {
-       EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
+       EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
        gboolean retval;
 
        retval = iface->has_document_links (document_links);
@@ -46,7 +46,7 @@ ev_document_links_has_document_links (EvDocumentLinks *document_links)
 GtkTreeModel *
 ev_document_links_get_links_model (EvDocumentLinks *document_links)
 {
-       EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
+       EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
        GtkTreeModel *retval;
 
        retval = iface->get_links_model (document_links);
@@ -54,23 +54,20 @@ ev_document_links_get_links_model (EvDocumentLinks *document_links)
        return retval;
 }
 
-GList *
+EvMappingList *
 ev_document_links_get_links (EvDocumentLinks *document_links,
                             EvPage          *page)
 {
-       EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
-       GList *retval;
+       EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
 
-       retval = iface->get_links (document_links, page);
-
-       return retval;
+       return iface->get_links (document_links, page);
 }
 
 EvLinkDest *
 ev_document_links_find_link_dest (EvDocumentLinks *document_links,
                                  const gchar     *link_name)
 {
-       EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
+       EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
        EvLinkDest *retval;
 
        ev_document_doc_mutex_lock ();
@@ -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;
+}