Merge with master

[lilypond.git] / lily / pango-select-scheme.cc

diff --git a/lily/pango-select-scheme.cc b/lily/pango-select-scheme.cc
index 89330c842ab88a263c49669f2878f8c550ddb93f..b1edd941c5e1c5f9004fd0d738269bc841ff8fb2 100644 (file)
--- a/lily/pango-select-scheme.cc
+++ b/lily/pango-select-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
@@ -19,7 +19,7 @@ LY_DEFINE (ly_make_pango_description_string, "ly:make-pango-description-string",
   PangoFontDescription *pfd = properties_to_pango_description (chain, scm_to_double (size));
   char *str = pango_font_description_to_string (pfd);
 
-  SCM scm_str = scm_makfrom0str (str);
+  SCM scm_str = scm_from_locale_string (str);
   g_free (str);
   pango_font_description_free (pfd);
   return scm_str;