Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / grob-smob.cc

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index 3702f2017fcea486c99c264840d058afb711073d..44c16e149fe9b478f55ad39615073718eae03da8 100644 (file)
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -22,9 +22,6 @@ Grob::mark_smob (SCM ses)
   Grob *s = (Grob *) SCM_CELL_WORD_1 (ses);
   scm_gc_mark (s->immutable_property_alist_);
 
-  if (s->key_)
-    scm_gc_mark (s->key_->self_scm ());
-
   /* Do not mark the parents.  The pointers in the mutable
      property list form two tree like structures (one for X
      relations, one for Y relations).  Marking these can be done
@@ -48,7 +45,7 @@ Grob::print_smob (SCM s, SCM port, scm_print_state *)
   Grob *sc = (Grob *) SCM_CELL_WORD_1 (s);
 
   scm_puts ("#<Grob ", port);
-  scm_puts ((char *) sc->name ().to_str0 (), port);
+  scm_puts ((char *) sc->name ().c_str (), port);
 
   /* Do not print properties, that is too much hassle.  */
   scm_puts (" >", port);