Add EvMappingList data struct instead of using a GList

[evince.git] / libdocument / ev-document-annotations.h

diff --git a/libdocument/ev-document-annotations.h b/libdocument/ev-document-annotations.h
index 3942ecfef0057330bd2ebaec36fc7c9fe5f3d9b2..6da49d9567fb528209967bc250bacdbee0cbeca8 100644 (file)
--- a/libdocument/ev-document-annotations.h
+++ b/libdocument/ev-document-annotations.h
@@ -15,9 +15,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
+
 #ifndef EV_DOCUMENT_ANNOTATIONS_H
 #define EV_DOCUMENT_ANNOTATIONS_H
 
@@ -25,38 +29,39 @@
 
 #include "ev-document.h"
 #include "ev-annotation.h"
+#include "ev-mapping-list.h"
 
 G_BEGIN_DECLS
 
 #define EV_TYPE_DOCUMENT_ANNOTATIONS            (ev_document_annotations_get_type ())
 #define EV_DOCUMENT_ANNOTATIONS(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotations))
-#define EV_DOCUMENT_ANNOTATIONS_IFACE(k)        (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsIface))
+#define EV_DOCUMENT_ANNOTATIONS_IFACE(k)        (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsInterface))
 #define EV_IS_DOCUMENT_ANNOTATIONS(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_ANNOTATIONS))
 #define EV_IS_DOCUMENT_ANNOTATIONS_IFACE(k)     (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_ANNOTATIONS))
-#define EV_DOCUMENT_ANNOTATIONS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsIface))
+#define EV_DOCUMENT_ANNOTATIONS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsInterface))
 
-typedef struct _EvDocumentAnnotations      EvDocumentAnnotations;
-typedef struct _EvDocumentAnnotationsIface EvDocumentAnnotationsIface;
+typedef struct _EvDocumentAnnotations          EvDocumentAnnotations;
+typedef struct _EvDocumentAnnotationsInterface EvDocumentAnnotationsInterface;
 
-struct _EvDocumentAnnotationsIface
+struct _EvDocumentAnnotationsInterface
 {
        GTypeInterface base_iface;
 
        /* Methods  */
-       GList *(* get_annotations)         (EvDocumentAnnotations *document_annots,
-                                           EvPage                *page);
-       void   (* annotation_set_contents) (EvDocumentAnnotations *document_annots,
-                                           EvAnnotation          *annot,
-                                           const gchar           *contents);
+       EvMappingList *(* get_annotations)         (EvDocumentAnnotations *document_annots,
+                                                   EvPage                *page);
+       void           (* annotation_set_contents) (EvDocumentAnnotations *document_annots,
+                                                   EvAnnotation          *annot,
+                                                   const gchar           *contents);
 };
 
-GType  ev_document_annotations_get_type                (void) G_GNUC_CONST;
-GList *ev_document_annotations_get_annotations         (EvDocumentAnnotations *document_annots,
-                                                       EvPage                *page);
+GType          ev_document_annotations_get_type                (void) G_GNUC_CONST;
+EvMappingList *ev_document_annotations_get_annotations         (EvDocumentAnnotations *document_annots,
+                                                               EvPage                *page);
 
-void   ev_document_annotations_annotation_set_contents (EvDocumentAnnotations *document_annots,
-                                                       EvAnnotation          *annot,
-                                                       const gchar           *contents);
+void           ev_document_annotations_annotation_set_contents (EvDocumentAnnotations *document_annots,
+                                                               EvAnnotation          *annot,
+                                                               const gchar           *contents);
 
 G_END_DECLS