[Gnash-commit] gnash/server edit_text_character.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/04 12:21:13

Modified files:
        server         : edit_text_character.cpp 

Log message:
        fix build with DEBUG_DYNTEXT_VARIABLES set

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.157&r2=1.158

Patches:
Index: edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- edit_text_character.cpp     19 Feb 2008 19:20:53 -0000      1.157
+++ edit_text_character.cpp     4 Mar 2008 12:21:13 -0000       1.158
@@ -1619,7 +1619,8 @@
        if (target->get_member(key, &val) )
        {
 #ifdef DEBUG_DYNTEXT_VARIABLES
-               log_debug(_("target sprite (%p) does have a member named %s"), 
(void*)sprite, _vm.getStringTable().value(key).c_str());
+               log_debug(_("target object (%s @ %p) does have a member named 
%s"),
+                       typeName(*target).c_str(), (void*)target, 
_vm.getStringTable().value(key).c_str());
 #endif
                // TODO: pass environment to to_string ?
                // as_environment& env = get_environment();
@@ -1627,10 +1628,13 @@
        }
        else
        {
+               as_value newVal = as_value(utf8::encodeCanonicalString(_text, 
version));
 #ifdef DEBUG_DYNTEXT_VARIABLES
-               log_debug(_("target sprite (%p) does NOT have a member named %s 
(no problem, we'll add it)"), (void*)sprite, 
_vm.getStringTable().value(key).c_str());
+               log_debug(_("target sprite (%s @ %p) does NOT have a member 
named %s (no problem, we'll add it with value %s)"),
+                       typeName(*target).c_str(), (void*)target, 
_vm.getStringTable().value(key).c_str(),
+                       newVal.to_debug_string().c_str());
 #endif
-               target->set_member(key, 
as_value(utf8::encodeCanonicalString(_text, version)));
+               target->set_member(key, newVal);
        }
 
        sprite_instance* sprite = target->to_movie();