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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/27 15:39:41

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        server/asobj   : Object.cpp 

Log message:
        (registerClass) hopefully got arguments index correctly this time (in 
error messages).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4984&r2=1.4985
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.398&r2=1.399
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4984
retrieving revision 1.4985
diff -u -b -r1.4984 -r1.4985
--- ChangeLog   27 Nov 2007 15:20:47 -0000      1.4984
+++ ChangeLog   27 Nov 2007 15:39:40 -0000      1.4985
@@ -1,5 +1,10 @@
 2007-11-27 Sandro Santilli <address@hidden>
 
+       * server/asobj/Object.cpp (object_registerClass): hopefully
+         got arguments index correctly this time (in error messages).
+
+2007-11-27 Sandro Santilli <address@hidden>
+
        * testsuite/misc-mtasc.all/check.as: add some dox over
          check_equals aimed at get first and second arguments
          in the correct way.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -b -r1.398 -r1.399
--- server/sprite_instance.cpp  27 Nov 2007 11:05:28 -0000      1.398
+++ server/sprite_instance.cpp  27 Nov 2007 15:39:41 -0000      1.399
@@ -3458,6 +3458,7 @@
        // when to really queue and when rather to execute immediately the 
        // events with priority INITIALIZE or CONSTRUCT ...
        //
+#if 0
        if ( isDynamic() )
        {
 #ifdef GNASH_DEBUG
@@ -3468,6 +3469,7 @@
        }
        else
        {
+#endif
 #ifdef GNASH_DEBUG
                log_debug("Queuing INITIALIZE event for sprite %s", 
getTarget().c_str());
 #endif
@@ -3478,7 +3480,7 @@
 #endif
                std::auto_ptr<ExecutableCode> code ( new ConstructEvent(this) );
                _vm.getRoot().pushAction(code, movie_root::apCONSTRUCT);
-       }
+       //}
 
        // Now execute frame tags and take care of queuing the LOAD event.
        //

Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/Object.cpp     20 Nov 2007 12:04:55 -0000      1.37
+++ server/asobj/Object.cpp     27 Nov 2007 15:39:41 -0000      1.38
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Object.cpp,v 1.37 2007/11/20 12:04:55 cmusick Exp $ */
+/* $Id: Object.cpp,v 1.38 2007/11/27 15:39:41 strk Exp $ */
 
 #include "tu_config.h"
 #include "Object.h"
@@ -275,7 +275,7 @@
                std::stringstream ss;
                fn.dump_args(ss);
                log_aserror(_("Invalid call to Object.registerClass(%s) - "
-                       "second argument (symbol id) evaluates to empty 
string"), ss.str().c_str());
+                       "first argument (symbol id) evaluates to empty 
string"), ss.str().c_str());
                );
                return as_value(false);
        }
@@ -287,7 +287,7 @@
                std::stringstream ss;
                fn.dump_args(ss);
                log_aserror(_("Invalid call to Object.registerClass(%s) - "
-                       "first argument is not a class/function)"), 
ss.str().c_str());
+                       "second argument (class) is not a function)"), 
ss.str().c_str());
                );
                return as_value(false);
        }