[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-54-ga967a31

[Benjamin Wolsey]

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  a967a312ef16facee45746fc4fb7dc03b3b5dedf (commit)
       via  ea3c28040d7b68cfe993ebc1646b5b60cfcdf9c5 (commit)
       via  20db12bb783c83c1ae678e3d0fc8f8dcaba4b6d7 (commit)
       via  645dd2a32c426f52a466f096dbb691cea03d76d2 (commit)
      from  fe891e16e9d249b3da4e23c0cc90aa4be056f5af (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=a967a312ef16facee45746fc4fb7dc03b3b5dedf


commit a967a312ef16facee45746fc4fb7dc03b3b5dedf
Merge: ea3c280 fe891e1
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Feb 13 18:16:13 2011 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


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


commit ea3c28040d7b68cfe993ebc1646b5b60cfcdf9c5
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Feb 13 18:16:00 2011 +0100

    Use ISO-compliant macro call.

diff --git a/libcore/asobj/Global_as.h b/libcore/asobj/Global_as.h
index 10cfa11..5df9618 100644
--- a/libcore/asobj/Global_as.h
+++ b/libcore/asobj/Global_as.h
@@ -26,6 +26,7 @@
 #include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
+#include <boost/preprocessor/facilities/empty.hpp>
 #include <boost/scoped_ptr.hpp>
 
 #include "as_object.h" 
@@ -237,7 +238,7 @@ callMethod(as_object* obj, const ObjectURI& uri 
BOOST_PP_COMMA_IF(n)\
 
 /// The maximum number of as_value arguments allowed in callMethod functions.
 #define MAX_ARGS 4
-BOOST_PP_REPEAT(BOOST_PP_INC(MAX_ARGS), CALL_METHOD, )
+BOOST_PP_REPEAT(BOOST_PP_INC(MAX_ARGS), CALL_METHOD, BOOST_PP_EMPTY)
 
 /// Convenience function for finding a class constructor.
 //

http://git.savannah.gnu.org/cgit//commit/?id=20db12bb783c83c1ae678e3d0fc8f8dcaba4b6d7


commit 20db12bb783c83c1ae678e3d0fc8f8dcaba4b6d7
Merge: 645dd2a 7eb76b3
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Feb 13 16:45:22 2011 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=645dd2a32c426f52a466f096dbb691cea03d76d2


commit 645dd2a32c426f52a466f096dbb691cea03d76d2
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Feb 11 14:18:05 2011 +0100

    Fix some parsing bugs and disable EI in plugin.

diff --git a/plugin/npapi/external.cpp b/plugin/npapi/external.cpp
index c0bab59..8931e90 100644
--- a/plugin/npapi/external.cpp
+++ b/plugin/npapi/external.cpp
@@ -251,12 +251,11 @@ ExternalInterface::parseInvoke(const std::string &xml)
 GnashNPVariant 
 ExternalInterface::parseXML(const std::string &xml)
 {
+    assert(!xml.empty());
+
     NPVariant value;
     NULL_TO_NPVARIANT(value);
     
-    if (xml.empty()) {
-        return value;
-    }
     std::string::size_type start = 0;
     std::string::size_type end;
     std::string tag;
@@ -386,6 +385,7 @@ ExternalInterface::parseProperties(const std::string &xml)
         start = end + 2;
         end = xml.find("</property>", start) ;
         std::string data = xml.substr(start, end-start);
+        if (data.empty()) break;
         props[id] = parseXML(data);
         start = xml.find(" id=", end);
     }
@@ -416,6 +416,7 @@ ExternalInterface::parseArguments(const std::string &xml)
         if (data == "</arguments>") {
             break;
         }
+        if (data.empty()) break;
         args.push_back(parseXML(sub));
         data.erase(0, end);
     }
diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index 02a2482..21932fc 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -851,7 +851,9 @@ nsPluginInstance::processPlayerRequest(gchar* buf, gsize 
linelen)
         
         NPN_GetURL(_instance, jsurl.str().c_str(), tgt);
         return true;
-    } else if (invoke->name == "addMethod") {
+    } 
+#if 0
+    else if (invoke->name == "addMethod") {
 
         assert(!invoke->args.empty());
         // Make this flash function accessible to Javascript. The
@@ -903,6 +905,7 @@ nsPluginInstance::processPlayerRequest(gchar* buf, gsize 
linelen)
         log_error("Couldn't write the response to Gnash, network problems.");
         return false;
     }
+#endif
     return true;
 }
 

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

Summary of changes:
 libcore/asobj/Global_as.h |    3 ++-
 plugin/npapi/external.cpp |    7 ++++---
 plugin/npapi/plugin.cpp   |    5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash