[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/27 14:26:41

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp (get_member):
                  clean up _name and _droptarget handling.
                  (btw, we should use addProperty for these).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1788&r2=1.1789
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.90&r2=1.91

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1788
retrieving revision 1.1789
diff -u -b -r1.1788 -r1.1789
--- ChangeLog   27 Nov 2006 13:46:24 -0000      1.1788
+++ ChangeLog   27 Nov 2006 14:26:41 -0000      1.1789
@@ -1,5 +1,8 @@
 2006-11-27 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (get_member):
+         clean up _name and _droptarget handling.
+         (btw, we should use addProperty for these).
        * testsuite/actionscript.all/MovieClip.as:
          fixed tests for SWF5 target.
        * testsuite/actionscript.all/dejagnu_so_init.as:

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/sprite_instance.cpp  27 Nov 2006 11:22:43 -0000      1.90
+++ server/sprite_instance.cpp  27 Nov 2006 14:26:41 -0000      1.91
@@ -959,6 +959,7 @@
 // Otherwise leave *val alone and return false.
 bool sprite_instance::get_member(const tu_stringi& name, as_value* val)
 {
+       // FIXME: use addProperty interface for these !!
        as_standard_member std_member = get_standard_member(name);
        switch (std_member)
        {
@@ -1063,7 +1064,11 @@
        case M_NAME:
            //else if (name == "_name")
        {
+           if ( _vm.getSWFVersion() < 6 && get_name().empty() )
+               val->set_undefined();
+           else
            val->set_string(get_name().c_str());
+
            return true;
        }
        case M_DROPTARGET:
@@ -1071,7 +1076,16 @@
        {
            // Absolute path in slash syntax where we were last dropped (?)
            // @@ TODO
-           val->set_string("/_root");
+               static bool warned = false;
+               if ( ! warned ) {
+                       log_warning("FIXME: MovieClip._droptarget 
unimplemented");
+                       warned=true;
+               }
+
+           if ( _vm.getSWFVersion() > 5 )
+               val->set_string("");
+           else
+               val->set_undefined();
            return true;
        }