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

[Michael Carlson]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Michael Carlson <address@hidden>        06/02/03 16:36:22

Modified files:
        .              : ChangeLog 
        server         : action.cpp 

Log message:
        SetTarget action is now implemented for non-blank strings
        
        This fixes several of my flash files up noticeably!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.70 gnash/ChangeLog:1.71
--- gnash/ChangeLog:1.70        Fri Feb  3 15:47:33 2006
+++ gnash/ChangeLog     Fri Feb  3 16:36:22 2006
@@ -1,3 +1,8 @@
+2006-02-03 Michael Carlson <address@hidden>
+
+       * server/action.cpp: SetTarget is now implemented for targets
+       other than ""
+
 2006-02-03 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/Function.as: tests for user-defined
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.14 gnash/server/action.cpp:1.15
--- gnash/server/action.cpp:1.14        Fri Feb  3 14:30:50 2006
+++ gnash/server/action.cpp     Fri Feb  3 16:36:22 2006
@@ -2721,8 +2721,16 @@
                                        const char* target_name = (const char*) 
&m_buffer[pc + 3];
                                        if (target_name[0] == 0) { 
env->set_target(original_target); }
                                        else {
-//                                             
env->set_target(env->get_target()->find_labeled_target(target_name));
-//                                             if (env->get_target() == NULL) 
env->set_target(original_target);
+                                               movie * cha = 
env->find_target((tu_string)target_name);
+                                               if (cha == NULL)
+                                               {
+                                                       
IF_VERBOSE_ACTION(log_error(
+                                                               "Couldn't find 
movie \"%s\" to set target to!"
+                                                               " Not setting 
target at all...",
+                                                               (const char 
*)target_name));
+                                               }
+                                               else
+                                                       env->set_target(cha);
                                        }
                                        break;
                                }
@@ -4034,6 +4042,9 @@
                        p++;
                }
 
+               if (*p == '\0')
+                       return env;
+
                for (;;)
                {
                        const char*     next_slash = next_slash_or_dot(p);