[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2247-g6671ff0

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  6671ff0f7c0c9d35d4432001a64f2c132f70158f (commit)
      from  15d61a804138737764689338c491c41f2cf59acf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=6671ff0f7c0c9d35d4432001a64f2c132f70158f


commit 6671ff0f7c0c9d35d4432001a64f2c132f70158f
Author: Nutchanon Wetchasit <address@hidden>
Date:   Tue Jan 12 13:27:28 2016 +0100

    Use SWF version-dependent string conversion in GetVariable() host interface.

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 3c643e9..c9ce412 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -1602,7 +1602,7 @@ movie_root::processInvoke(ExternalInterface::invoke_t 
*invoke)
             // If the variable exists, GetVariable returns a string
             // representation of its value. Variable with undefined
             // or null value counts as exist too.
-            ss << ExternalInterface::toXML(val.to_string());
+            ss << ExternalInterface::toXML(val.to_string(_vm.getSWFVersion()));
             ss << std::endl;
         } else {
             // If the variable does not exist, GetVariable sends null value
diff --git a/testsuite/misc-ming.all/extgetvariable_testrunner.sh 
b/testsuite/misc-ming.all/extgetvariable_testrunner.sh
index 956d274..2380f2b 100644
--- a/testsuite/misc-ming.all/extgetvariable_testrunner.sh
+++ b/testsuite/misc-ming.all/extgetvariable_testrunner.sh
@@ -247,11 +247,11 @@ echo '<invoke name="GetVariable" 
returntype="xml"><arguments><string>unassigned_
 
 # Read for return value statement
 read_timeout LINE \$READTIMEOUT <&3
-if [ "${swfversion}" -gt 5 ]
+if [ "${swfversion}" -gt 6 ]
 then
        check_equals "\$LINE" '<string>undefined</string>' "Gnash should return 
a correct value from GetVariable call on unassigned variable"
 else
-       xcheck_equals "\$LINE" '<string></string>' "Gnash should return a 
correct value from GetVariable call on unassigned variable"
+       check_equals "\$LINE" '<string></string>' "Gnash should return a 
correct value from GetVariable call on unassigned variable"
 fi
 
 # Call string-returning GetVariable() on variable with undefined value
@@ -259,11 +259,11 @@ echo '<invoke name="GetVariable" 
returntype="xml"><arguments><string>undefined_v
 
 # Read for return value statement
 read_timeout LINE \$READTIMEOUT <&3
-if [ "${swfversion}" -gt 5 ]
+if [ "${swfversion}" -gt 6 ]
 then
        check_equals "\$LINE" '<string>undefined</string>' "Gnash should return 
a correct value from GetVariable call on variable with undefined value"
 else
-       xcheck_equals "\$LINE" '<string></string>' "Gnash should return a 
correct value from GetVariable call on variable with undefined value"
+       check_equals "\$LINE" '<string></string>' "Gnash should return a 
correct value from GetVariable call on variable with undefined value"
 fi
 
 # Call string-returning GetVariable() on non-existent variable

-----------------------------------------------------------------------

Summary of changes:
 libcore/movie_root.cpp                             |    2 +-
 .../misc-ming.all/extgetvariable_testrunner.sh     |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash