[Emacs-diffs] /srv/bzr/emacs/trunk r109628: Fix last change to xg_get_font.

[Chong Yidong]

------------------------------------------------------------
revno: 109628
author: Dmitry Antipov <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-15 17:40:00 +0800
message:
  Fix last change to xg_get_font.
  
  * gtkutil.c (xg_get_font): Use pango_units_to_double.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-15 07:58:34 +0000
+++ b/src/ChangeLog     2012-08-15 09:40:00 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Dmitry Antipov  <address@hidden>
+
+       * gtkutil.c (xg_get_font): Use pango_units_to_double.
+
 2012-08-15  Chong Yidong  <address@hidden>
 
        * gtkutil.c (xg_get_font): Rename from xg_get_font_name.  When

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-08-15 07:58:34 +0000
+++ b/src/gtkutil.c     2012-08-15 09:40:00 +0000
@@ -2101,15 +2101,15 @@
        {
          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);