CVS: sylpheedclaws/sylpheed-claws/src/gtk gtksourceprintjob.c,1.1.2.5,1.1.2.6

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/gtk
In directory sunsite.dk:/tmp/cvs-serv7737/src/gtk

Modified Files:
      Tag: gtk2
	gtksourceprintjob.c 
Log Message:
2006-12-14 [paul]	2.6.1cvs33

	* src/messageview.c
	* src/messageview.h
	* src/mimeview.c
	* src/mimeview.h
	* src/summaryview.c
	* src/textview.c
	* src/textview.h
		Fix printing of selection
		Fix printing of message parts
		Fix printing of images
	* src/gtk/gtksourceprintjob.c
		Fix page count when there are images

Index: gtksourceprintjob.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/gtk/Attic/gtksourceprintjob.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- gtksourceprintjob.c	2006/02/09 17:21:21	1.1.2.5
+++ gtksourceprintjob.c	2006/12/14 09:49:25	1.1.2.6
@@ -1461,9 +1461,7 @@
 
 		}
 		while (pango_layout_iter_next_line (iter));
-
 		job->priv->available_height -= max - page_skip;
-
 		pango_layout_iter_free (iter);
 		g_object_unref (layout);
 	} else {
@@ -1476,10 +1474,9 @@
 					 job->priv->text_width, 
 					 job->priv->text_height,
 					 &scaled_width, &scaled_height);
-
 		if (scaled_height > max_height) {
 			job->priv->page_count++;
-			job->priv->available_height = job->priv->text_height;
+			job->priv->available_height = job->priv->text_height - scaled_height;
 		} else {
 			job->priv->available_height -= scaled_height;
 		}