Convert EvDocument interface into an abstract class

1 files changed, 30 insertions, 34 deletions

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index 7f10c9a..d122ba7 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -37,12 +37,12 @@
 
 struct _TiffDocumentClass
 {
-  GObjectClass parent_class;
+  EvDocumentClass parent_class;
 };
 
 struct _TiffDocument
 {
-  GObject parent_instance;
+  EvDocument parent_instance;
 
   TIFF *tiff;
   gint n_pages;
@@ -53,7 +53,6 @@ struct _TiffDocument
 
 typedef struct _TiffDocumentClass TiffDocumentClass;
 
-static void tiff_document_document_iface_init (EvDocumentIface *iface);
 static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface);
 
@@ -384,39 +383,18 @@ tiff_document_render_pixbuf (EvDocument      *document,
 	return rotated_pixbuf;
 }
 
-static void
-tiff_document_finalize (GObject *object)
-{
-	TiffDocument *tiff_document = TIFF_DOCUMENT (object);
-
-	if (tiff_document->tiff)
-		TIFFClose (tiff_document->tiff);
-	if (tiff_document->uri)
-		g_free (tiff_document->uri);
-
-	G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
-}
-
-static void
-tiff_document_class_init (TiffDocumentClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = tiff_document_finalize;
-}
-
 static gchar *
 tiff_document_get_page_label (EvDocument *document,
 			      EvPage     *page)
 {
 	TiffDocument *tiff_document = TIFF_DOCUMENT (document);
 	static gchar *label;
-	
+
 	if (TIFFGetField (tiff_document->tiff, TIFFTAG_PAGENAME, &label) &&
 	    g_utf8_validate (label, -1, NULL)) {
 		return g_strdup (label);
 	}
-	
+
 	return NULL;
 }
 
@@ -432,15 +410,33 @@ tiff_document_get_info (EvDocument *document)
 }
 
 static void
-tiff_document_document_iface_init (EvDocumentIface *iface)
+tiff_document_finalize (GObject *object)
+{
+	TiffDocument *tiff_document = TIFF_DOCUMENT (object);
+
+	if (tiff_document->tiff)
+		TIFFClose (tiff_document->tiff);
+	if (tiff_document->uri)
+		g_free (tiff_document->uri);
+
+	G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
+}
+
+static void
+tiff_document_class_init (TiffDocumentClass *klass)
 {
-	iface->load = tiff_document_load;
-	iface->save = tiff_document_save;
-	iface->get_n_pages = tiff_document_get_n_pages;
-	iface->get_page_size = tiff_document_get_page_size;
-	iface->render = tiff_document_render;
-	iface->get_page_label = tiff_document_get_page_label;
-	iface->get_info = tiff_document_get_info;
+	GObjectClass    *gobject_class = G_OBJECT_CLASS (klass);
+	EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass);
+
+	gobject_class->finalize = tiff_document_finalize;
+
+	ev_document_class->load = tiff_document_load;
+	ev_document_class->save = tiff_document_save;
+	ev_document_class->get_n_pages = tiff_document_get_n_pages;
+	ev_document_class->get_page_size = tiff_document_get_page_size;
+	ev_document_class->render = tiff_document_render;
+	ev_document_class->get_page_label = tiff_document_get_page_label;
+	ev_document_class->get_info = tiff_document_get_info;
 }
 
 static GdkPixbuf *