Fix last change to xg_get_font.

* gtkutil.c (xg_get_font): Use pango_units_to_double.

diff --git a/src/ChangeLog b/src/ChangeLog
index dc08d002021a0ee82ea16c14bf24031cc20bf302..e45b4de48d9a989dff4b768d010422e3ab390aaf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * gtkutil.c (xg_get_font): Use pango_units_to_double.
+
 2012-08-15  Chong Yidong  <cyd@gnu.org>
 
        * gtkutil.c (xg_get_font): Rename from xg_get_font_name.  When

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 2c9a1377dca7270024b1c869459db65935675c28..194a1044952b11d4987bf700195c0cebf97fd9f8 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2101,15 +2101,15 @@ xg_get_font (FRAME_PTR f, const char *default_name)
        {
          Lisp_Object args[8];
          const char *name   = pango_font_description_get_family (desc);
+         gint        size   = pango_font_description_get_size (desc);
          PangoWeight weight = pango_font_description_get_weight (desc);
-         PangoStyle   style = pango_font_description_get_style (desc);
+         PangoStyle  style  = pango_font_description_get_style (desc);
 
          args[0] = QCname;
          args[1] = build_string (name);
 
          args[2] = QCsize;
-         args[3] = make_float (((double) pango_font_description_get_size (desc))
-                               / PANGO_SCALE);
+         args[3] = make_float (pango_units_to_double (size));
 
          args[4] = QCweight;
          args[5] = XG_WEIGHT_TO_SYMBOL (weight);