[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-55-g9481729

[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  948172996108176d96451ee57d6f26ca0cdc41bd (commit)
      from  a967a312ef16facee45746fc4fb7dc03b3b5dedf (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=948172996108176d96451ee57d6f26ca0cdc41bd


commit 948172996108176d96451ee57d6f26ca0cdc41bd
Author: Benjamin Wolsey <address@hidden>
Date:   Sun Feb 13 18:22:16 2011 +0100

    Revert "Fix some parsing bugs and disable EI in plugin."
    
    This reverts commit 645dd2a32c426f52a466f096dbb691cea03d76d2.

diff --git a/plugin/npapi/external.cpp b/plugin/npapi/external.cpp
index f44d1c4..a60e771 100644
--- a/plugin/npapi/external.cpp
+++ b/plugin/npapi/external.cpp
@@ -257,11 +257,12 @@ 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;
@@ -395,7 +396,6 @@ 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);
     }
@@ -429,7 +429,6 @@ 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 21932fc..02a2482 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -851,9 +851,7 @@ nsPluginInstance::processPlayerRequest(gchar* buf, gsize 
linelen)
         
         NPN_GetURL(_instance, jsurl.str().c_str(), tgt);
         return true;
-    } 
-#if 0
-    else if (invoke->name == "addMethod") {
+    } else if (invoke->name == "addMethod") {
 
         assert(!invoke->args.empty());
         // Make this flash function accessible to Javascript. The
@@ -905,7 +903,6 @@ 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:
 plugin/npapi/external.cpp |    7 +++----
 plugin/npapi/plugin.cpp   |    5 +----
 2 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Gnash