[Gnash-commit] /srv/bzr/gnash/trunk r12209: go back to the old behaviour.

[Rob Savoye]

------------------------------------------------------------
revno: 12209
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-06-02 14:44:00 -0600
message:
  go back to the old behaviour.
modified:
  libcore/asobj/flash/system/System_as.cpp
  plugin/npapi/plugin.cpp
  testsuite/actionscript.all/System.as

=== modified file 'libcore/asobj/flash/system/System_as.cpp'
--- a/libcore/asobj/flash/system/System_as.cpp  2010-05-21 17:10:27 +0000
+++ b/libcore/asobj/flash/system/System_as.cpp  2010-06-02 20:44:00 +0000
@@ -97,16 +97,11 @@
     VM& vm = getVM(o);
     o.init_member("allowDomain", vm.getNative(12, 0));
 
-    const int swf7Flags = PropFlags::dontDelete | PropFlags::dontEnum
-        | PropFlags::readOnly | PropFlags::onlySWF7Up;
-
     Global_as& gl = getGlobal(o);
     o.init_member("allowInsecureDomain",
-                  gl.createFunction(system_security_allowinsecuredomain),
-                  swf7Flags);
+                  gl.createFunction(system_security_allowinsecuredomain));
     o.init_member("loadPolicyFile",
-                  gl.createFunction(system_security_loadpolicyfile),
-                  swf7Flags);
+                  gl.createFunction(system_security_loadpolicyfile));
 }
 
 void

=== modified file 'plugin/npapi/plugin.cpp'
--- a/plugin/npapi/plugin.cpp   2010-06-02 14:18:20 +0000
+++ b/plugin/npapi/plugin.cpp   2010-06-02 20:44:00 +0000
@@ -186,7 +186,7 @@
     */
     char* opts = std::getenv("GNASH_OPTIONS");
     if (opts != NULL) {
-        gnash::log_debug(std::string("GNASH_OPTIONS : ") + std::string(opts));
+        gnash::log_debug("GNASH_OPTIONS : ", opts);
         
         // Should the plugin wait for gdb to be attached?
         if ( strstr(opts, "waitforgdb") ) {

=== modified file 'testsuite/actionscript.all/System.as'
--- a/testsuite/actionscript.all/System.as      2010-05-25 19:03:26 +0000
+++ b/testsuite/actionscript.all/System.as      2010-06-02 20:44:00 +0000
@@ -72,14 +72,14 @@
 // test the System.showSettings method
 check_equals ( typeof(System.showSettings), 'function');
 
-#if OUTPUT_VERSION >= 7
-
 // test the System::security.allowDomain method
 check_equals ( typeof(System.security.allowDomain), 'function' );
 
 // test the System.security.loadPolicyFile method
 check_equals ( typeof(System.security.loadPolicyFile), 'function');
 
+#if OUTPUT_VERSION >= 7
+
 // test the System.security.allowInsecureDomain method
 // added in player 7
 check_equals ( typeof(System.security.allowInsecureDomain), 'function' );
@@ -200,8 +200,8 @@
  check_totals(93);
 #else
 # if OUTPUT_VERSION == 6
-   check_totals(90);
+   check_totals(92);
 # else
-   check_totals(57);
+   check_totals(59);
 # endif
 #endif