gtk+ r21841 - in trunk: . gtk

[mkasik svn gnome org]

Author: mkasik
Date: Wed Dec  3 10:17:45 2008
New Revision: 21841
URL: http://svn.gnome.org/viewvc/gtk+?rev=21841&view=rev

Log:
2008-12-03  Marek Kasik  <mkasik redhat com>

	Bug 559914 â eog doesn't apply paper setup.

	* gtk/gtkpapersize.c: Call the gtk_paper_size_new_from_ppd() with width
	and height in points.


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkpapersize.c

Modified: trunk/gtk/gtkpapersize.c
==============================================================================
--- trunk/gtk/gtkpapersize.c	(original)
+++ trunk/gtk/gtkpapersize.c	Wed Dec  3 10:17:45 2008
@@ -852,8 +852,10 @@
     display_name = g_strdup (name);
 
   if (ppd_name != NULL)
-    paper_size = gtk_paper_size_new_from_ppd (ppd_name, display_name,
-			                      width, height);
+    paper_size = gtk_paper_size_new_from_ppd (ppd_name,
+                                              display_name,
+                                              _gtk_print_convert_from_mm (width, GTK_UNIT_POINTS),
+                                              _gtk_print_convert_from_mm (height, GTK_UNIT_POINTS));
   else if (name != NULL)
     paper_size = gtk_paper_size_new_custom (name, display_name,
 					    width, height, GTK_UNIT_MM);