[gnome-scan/gnome-scan-0-6: 14/23] Convert width and height to GTK_UNIT_MM.

[Philipp Sadleder <phsadleder src gnome org>]

commit a38063547208c4da6d7fbd84c3165b52a8ead3ab
Author: Philipp Sadleder <phsadleder src gnome org>
Date:   Mon Jan 19 12:40:27 2009 +0000

    Convert width and height to GTK_UNIT_MM.
    
    svn path=/branches/GNOME_SCAN_0_6/; revision=797
---
 ChangeLog                  |    6 ++++++
 modules/gsane-meta-param.c |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84fc4df..1c24beb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-19  Philipp Sadleder  <philipp sadleder de>
+
+	* modules/gsane-meta-param.c (meta_param_paper_size_add_param):
+	Convert width and height to GTK_UNIT_MM before passing to
+	gtk_paper_size_new_custom. Fixes #567377.
+
 2009-01-15  Ã?tienne BERSAC  <bersace03 laposte net>
 
 	* modules/gsane-scanner.c (gss_data_gray1):
diff --git a/modules/gsane-meta-param.c b/modules/gsane-meta-param.c
index dac4f43..9ebb94b 100644
--- a/modules/gsane-meta-param.c
+++ b/modules/gsane-meta-param.c
@@ -338,9 +338,9 @@ meta_param_paper_size_get_params			(MetaParam *mp)
 	enumeration = g_slist_append (enumeration,
 								  gtk_paper_size_new_custom ("maximal",
 															 _("Maximal"),
-															 (gdouble) rect.width,
-															 (gdouble) rect.height,
-															 gs_param_spec_get_unit (mpps->tl_x)));
+															 gs_convert_to_mm (rect.width, gs_param_spec_get_unit (mpps->tl_x), mpps->resolution),
+															 gs_convert_to_mm (rect.height, gs_param_spec_get_unit (mpps->tl_x), mpps->resolution),
+															 GTK_UNIT_MM));
 	for (i = 0 ; names[i] ; i++) {
 		enumeration = g_slist_append (enumeration,
 									  gtk_paper_size_new (names[i]));