[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2260-gb74d6b8

[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  b74d6b87e5d276326d20a44456874d548d1fe658 (commit)
       via  1d80521d4411e3c3959d9d96989ff9ac8fc36290 (commit)
      from  435d3e9aa7864883f6a2379fd318126113786475 (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=b74d6b87e5d276326d20a44456874d548d1fe658


commit b74d6b87e5d276326d20a44456874d548d1fe658
Author: Sandro Santilli <address@hidden>
Date:   Mon Feb 15 11:12:51 2016 +0100

    Fix unused variable warning

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 314a85b..5faff86 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -1606,7 +1606,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(_vm.getSWFVersion()));
+            ss << ExternalInterface::toXML(val.to_string(vm.getSWFVersion()));
             ss << std::endl;
         } else {
             // If the variable does not exist, GetVariable sends null value

http://git.savannah.gnu.org/cgit//commit/?id=1d80521d4411e3c3959d9d96989ff9ac8fc36290


commit 1d80521d4411e3c3959d9d96989ff9ac8fc36290
Author: Nutchanon Wetchasit <address@hidden>
Date:   Mon Feb 15 11:09:56 2016 +0100

    Make GetVariable() plugin function use internal ActionGetVariable 
implementation.
    
    This fixes variable path notation issue of bug #42395.
    See <https://savannah.gnu.org/bugs/?42395>

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index c9ce412..314a85b 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -1596,9 +1596,13 @@ movie_root::processInvoke(ExternalInterface::invoke_t 
*invoke)
         MovieClip *mc = getLevel(0);
         as_object *obj = getObject(mc);
         VM &vm = getVM();
+        as_environment timeline = mc->get_environment();
+        as_environment::ScopeStack scope;
+        as_object *container = NULL;
         std::string var = invoke->args[0].to_string();
-        as_value val;
-        if (obj->get_member(getURI(vm, var), &val)) {
+        scope.push_back(obj);
+        as_value val = getVariable(timeline, var, scope, &container);
+        if (container != NULL) {
             // If the variable exists, GetVariable returns a string
             // representation of its value. Variable with undefined
             // or null value counts as exist too.

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

Summary of changes:
 libcore/movie_root.cpp |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash