Revert "Issue 4360: Reorganize smob initialization to make it more reliable"

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index d37bf954c680f4ca342b9c3c30a0026f5c02c0a6..d6874ef78ca35d90a0e4a088405183961f17870c 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -154,7 +154,7 @@ Translator::add_translator_listener (translator_listener_record **listener_list,
   // the static translator_listener_record chains while garbage
   // collecting.
 
-  SCM class_sym = scm_permanent_object (scm_from_locale_symbol (name.c_str ()));
+  SCM class_sym = scm_permanent_object (scm_from_ascii_symbol (name.c_str ()));
 
   r->event_class_ = class_sym;
   r->get_listener_ = get_listener;
@@ -178,7 +178,7 @@ Translator::static_translator_description (const char *grobs,
                                  parse_symbol_list (grobs), static_properties);
 
   static_properties = scm_acons (ly_symbol2scm ("description"),
-                                 scm_from_locale_string (desc), static_properties);
+                                 scm_from_utf8_string (desc), static_properties);
 
   SCM list = SCM_EOL;
   for (; listener_list; listener_list = listener_list->next_)
@@ -240,7 +240,7 @@ Translator::print_smob (SCM port, scm_print_state *)
 }
 
 void
-add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
+add_acknowledger (Translator::Grob_info_callback ptr,
                   char const *func_name,
                   vector<Acknowledge_information> *ack_array)
 {
@@ -259,7 +259,7 @@ add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
   ack_array->push_back (inf);
 }
 
-Engraver_void_function_engraver_grob_info
+Translator::Grob_info_callback
 generic_get_acknowledger (SCM sym, vector<Acknowledge_information> const *ack_array)
 {
   for (vsize i = 0; i < ack_array->size (); i++)