[Gnash-commit] gnash ChangeLog gui/Player.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/31 20:54:42

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp 

Log message:
        (load_movie): still add the acutual filename, if given, in the list of
        local sandboxes, or "gnash -u http://remote ./local.swf" won't work (the
        konqueror plugin uses that format, btw).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5540&r2=1.5541
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.79&r2=1.80

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5540
retrieving revision 1.5541
diff -u -b -r1.5540 -r1.5541
--- ChangeLog   31 Jan 2008 16:25:31 -0000      1.5540
+++ ChangeLog   31 Jan 2008 20:54:41 -0000      1.5541
@@ -1,5 +1,12 @@
 2008-01-31 Sandro Santilli <address@hidden>
 
+       * gui/Player.cpp (load_movie): still add the acutual filename, if
+         given, in the list of local sandboxes, or "gnash -u http://remote
+         ./local.swf" won't work (the konqueror plugin uses that format,
+         btw).
+
+2008-01-31 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/targetPath.as: make the test
          buildable with Ming head.
 

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- gui/Player.cpp      30 Jan 2008 16:07:49 -0000      1.79
+++ gui/Player.cpp      31 Jan 2008 20:54:42 -0000      1.80
@@ -230,6 +230,19 @@
        else
        {
                URL url(_infile);
+               if ( url.protocol() == "file" )
+               {
+                       std::string path = url.path();
+                       // We'll need to allow load of the file, no matter 
virtual url
+                       // specified...
+                       // This is kind of hackish, cleaner would be adding an 
argument
+                       // to create_library_movie to skip the security 
checking phase.
+                       // NOTE that if we fail to allow this load, the 
konqueror plugin
+                       // would not be able to load anything
+                       //
+                       rcfile.addLocalSandboxPath(path);
+                       log_debug(_("%s appended to local sandboxes"), 
path.c_str());
+               }
 
                // _url should be always set at this point...
                md = gnash::create_library_movie(url, _url.c_str(), false);