X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=dvi%2Fdvi-document.c;h=4285f6888e7ec6b1628229d5e7ea4c592465cac8;hb=8d9be03e67f22cde4761220c53e36a32d9ebbe30;hp=b9edc9e65c4a95462c7afff94558b6cbaddbaf1d;hpb=1561766454d8a06d887da5c2955b8c4d1dddd9a3;p=evince.git

diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c
index b9edc9e6..4285f688 100644
--- a/dvi/dvi-document.c
+++ b/dvi/dvi-document.c
@@ -92,10 +92,10 @@ dvi_document_load (EvDocument  *document,
     mdvi_pixbuf_device_init (&dvi_document->context->device);
 
     dvi_document->base_width = dvi_document->context->dvi_page_w * dvi_document->context->params.conv 
-		+ 2 * unit2pix(dvi_document->params->dpi, MDVI_VMARGIN) / dvi_document->params->hshrink;
+		+ 2 * unit2pix(dvi_document->params->dpi, MDVI_HMARGIN) / dvi_document->params->hshrink;
 		
     dvi_document->base_height = dvi_document->context->dvi_page_h * dvi_document->context->params.vconv 
-	        + 2 * unit2pix(dvi_document->params->dpi, MDVI_VMARGIN) / dvi_document->params->vshrink;
+	        + 2 * unit2pix(dvi_document->params->vdpi, MDVI_VMARGIN) / dvi_document->params->vshrink;
 
     dvi_context_mutex = g_mutex_new ();
 
@@ -198,33 +198,6 @@ dvi_document_finalize (GObject *object)
 	G_OBJECT_CLASS (dvi_document_parent_class)->finalize (object);
 }
 
-static void
-dvi_document_set_property (GObject *object,
-		              guint prop_id,
-			      const GValue *value,
-			      GParamSpec *pspec)
-{
-	switch (prop_id)
-	{
-		case PROP_TITLE:
-			/* read only */
-			break;
-	}
-}
-
-static void
-dvi_document_get_property (GObject *object,
-		              guint prop_id,
-		              GValue *value,
-		              GParamSpec *pspec)
-{
-	switch (prop_id)
-	{
-		case PROP_TITLE:
-			g_value_set_string (value, NULL);
-			break;
-	}
-}
 
 static void
 dvi_document_class_init (DviDocumentClass *klass)
@@ -232,10 +205,6 @@ dvi_document_class_init (DviDocumentClass *klass)
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
 	gobject_class->finalize = dvi_document_finalize;
-	gobject_class->get_property = dvi_document_get_property;
-	gobject_class->set_property = dvi_document_set_property;
-
-	g_object_class_override_property (gobject_class, PROP_TITLE, "title");
 }
 
 static gboolean
@@ -244,6 +213,16 @@ dvi_document_can_get_text (EvDocument *document)
 	return FALSE;
 }
 
+static EvDocumentInfo *
+dvi_document_get_info (EvDocument *document)
+{
+	EvDocumentInfo *info;
+
+	info = g_new0 (EvDocumentInfo, 1);
+
+	return info;
+}
+
 static void
 dvi_document_document_iface_init (EvDocumentIface *iface)
 {
@@ -253,6 +232,7 @@ dvi_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_n_pages = dvi_document_get_n_pages;
 	iface->get_page_size = dvi_document_get_page_size;
 	iface->render_pixbuf = dvi_document_render_pixbuf;
+	iface->get_info = dvi_document_get_info;
 }
 
 static void
@@ -292,7 +272,7 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 
 	mdvi_set_shrink (dvi_document->context, 
 			  (int)dvi_document->base_width * dvi_document->params->hshrink / thumb_width,
-			  (int)dvi_document->base_width * dvi_document->params->vshrink / thumb_height);
+			  (int)dvi_document->base_height * dvi_document->params->vshrink / thumb_height);
 
 	proposed_width = dvi_document->context->dvi_page_w * dvi_document->context->params.conv;
 	proposed_height = dvi_document->context->dvi_page_h * dvi_document->context->params.vconv;
@@ -348,7 +328,7 @@ dvi_document_init_params (DviDocument *dvi_document)
 	dvi_document->params->hdrift   = 0;
 	dvi_document->params->vdrift   = 0;
 	dvi_document->params->hshrink  =  MDVI_SHRINK_FROM_DPI(dvi_document->params->dpi);
-	dvi_document->params->vshrink  =  MDVI_SHRINK_FROM_DPI(dvi_document->params->dpi);
+	dvi_document->params->vshrink  =  MDVI_SHRINK_FROM_DPI(dvi_document->params->vdpi);
 	dvi_document->params->orientation = MDVI_ORIENT_TBLR;
 
 	dvi_document->spec = NULL;