[Gnash-commit] gnash ChangeLog plugin/plugin.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/27 12:59:35

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 

Log message:
                * plugin/plugin.cpp: use the new -U switch when invoking
                  gnash (pass it the base url)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.937&r2=1.938
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.937
retrieving revision 1.938
diff -u -b -r1.937 -r1.938
--- ChangeLog   27 Sep 2006 12:52:14 -0000      1.937
+++ ChangeLog   27 Sep 2006 12:59:35 -0000      1.938
@@ -1,5 +1,10 @@
 2006-09-27 Sandro Santilli  <address@hidden>
 
+       * plugin/plugin.cpp: use the new -U switch when invoking
+         gnash (pass it the base url)
+
+2006-09-27 Sandro Santilli  <address@hidden>
+
        * server/gnash.h, server/impl.cpp: added set_base_url() and
          get_base_url() function.
        * gui/Player.{h,cpp}: added setBaseUrl method.

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- plugin/plugin.cpp   27 Sep 2006 11:48:46 -0000      1.56
+++ plugin/plugin.cpp   27 Sep 2006 12:59:35 -0000      1.57
@@ -591,9 +591,10 @@
     // setup the command line
 
     const char* pageurl = getCurrentPageURL();
-    if ( pageurl )
+    if ( ! pageurl )
     {
-       log_msg("UNIMPLEMENTED: current page url: %s", pageurl);
+       log_error("Could not get current page URL!");
+       //log_msg("UNIMPLEMENTED: current page url: %s", pageurl);
        // invoke gnash with -U <current_page_url>
     }
 
@@ -617,7 +618,7 @@
         paramvalues.push_back(param);
     }
 
-    const size_t maxargc = 12 + paramvalues.size()*2;
+    const size_t maxargc = 14 + paramvalues.size()*2;
     char **argv = new char *[maxargc];
 
     size_t argc = 0;
@@ -631,6 +632,11 @@
     argv[argc++] = height;
     argv[argc++] = "-u";
     argv[argc++] = const_cast<char*>( _swf_url.c_str() );
+    if ( pageurl )
+    {
+       argv[argc++] = "-U";
+       argv[argc++] = const_cast<char*>( pageurl );
+    }
 
     for ( size_t i=0, n=paramvalues.size(); i<n; ++i)
     {