X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Ftiff%2Ftiff-document.c;h=9c113b49638591c04fdd830eab64e278e4d1110b;hb=0d4b04e81ba8e6a8df689167fe1be9cf4a9ebf35;hp=7f10c9ab7496b6edfdbd0e9244eacce26bdbea34;hpb=55cba8c3fe89f3baf75dd0d84f79a0e0d9c8eed0;p=evince.git

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index 7f10c9ab..9c113b49 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -14,7 +14,7 @@
  *
  * 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.
  */
 
 /* FIXME: Should probably buffer calls to libtiff with TIFFSetWarningHandler
@@ -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,9 +53,8 @@ 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);
+static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface);
+static void tiff_document_document_file_exporter_iface_init (EvFileExporterInterface *iface);
 
 EV_BACKEND_REGISTER_WITH_CODE (TiffDocument, tiff_document,
 			 {
@@ -384,63 +383,48 @@ 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;
 }
 
-static EvDocumentInfo *
-tiff_document_get_info (EvDocument *document)
+static void
+tiff_document_finalize (GObject *object)
 {
-	EvDocumentInfo *info;
+	TiffDocument *tiff_document = TIFF_DOCUMENT (object);
 
-	info = g_new0 (EvDocumentInfo, 1);
-	info->fields_mask = 0;
+	if (tiff_document->tiff)
+		TIFFClose (tiff_document->tiff);
+	if (tiff_document->uri)
+		g_free (tiff_document->uri);
 
-	return info;
+	G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
 }
 
 static void
-tiff_document_document_iface_init (EvDocumentIface *iface)
+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;
 }
 
 static GdkPixbuf *
@@ -484,7 +468,7 @@ tiff_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
 }
 
 static void
-tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
+tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface)
 {
 	iface->get_thumbnail = tiff_document_thumbnails_get_thumbnail;
 	iface->get_dimensions = tiff_document_thumbnails_get_dimensions;
@@ -534,7 +518,7 @@ tiff_document_file_exporter_get_capabilities (EvFileExporter *exporter)
 }
 
 static void
-tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface)
+tiff_document_document_file_exporter_iface_init (EvFileExporterInterface *iface)
 {
 	iface->begin = tiff_document_file_exporter_begin;
 	iface->do_page = tiff_document_file_exporter_do_page;