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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/04 14:54:46

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp 
        server/vm      : ASHandlers.cpp 

Log message:
                * gui/Player.cpp (fs_callback): don't forget the newline ending
                  (the gnash-to-host protocol needs some real definition).
                * server/vm/ASHandlers.cpp (CommonGetUrl): consitent logging
                  for gnash-to-host comunication.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6181&r2=1.6182
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.225&r2=1.226

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6181
retrieving revision 1.6182
diff -u -b -r1.6181 -r1.6182
--- ChangeLog   4 Apr 2008 14:23:44 -0000       1.6181
+++ ChangeLog   4 Apr 2008 14:54:45 -0000       1.6182
@@ -1,5 +1,12 @@
 2008-04-04 Sandro Santilli <address@hidden>
 
+       * gui/Player.cpp (fs_callback): don't forget the newline ending
+         (the gnash-to-host protocol needs some real definition).
+       * server/vm/ASHandlers.cpp (CommonGetUrl): consitent logging
+         for gnash-to-host comunication.
+
+2008-04-04 Sandro Santilli <address@hidden>
+
        * gui/Player.cpp (fs_callback): if an host-fd is given, always
          send an INVOKE request for fscommands, no matter how we've
          been called (standalone or plugin).

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- gui/Player.cpp      4 Apr 2008 14:23:45 -0000       1.94
+++ gui/Player.cpp      4 Apr 2008 14:54:46 -0000       1.95
@@ -413,7 +413,7 @@
        {
                //log_debug("user-provided host requests fd is %d", hostfd);
                std::stringstream request;
-               request << "INVOKE " << command << ":" << args;
+               request << "INVOKE " << command << ":" << args << endl;
 
                string requestString = request.str();
                const char* cmd = requestString.c_str();
@@ -431,7 +431,8 @@
                        log_error("Could only write %d bytes over "SIZET_FMT" 
required to user-provided host requests fd %d",
                                ret, len, hostfd);
                }
-               log_debug(_("Sent request '%s' to host fd %d"), cmd, hostfd);
+               requestString.resize(requestString.size()-1); // for sake of 
clean logging, should always end with newline
+               log_debug(_("Sent request '%s' to host fd %d"), requestString, 
hostfd);
        }
 
        /// Fscommands can be ignored using an rcfile setting. As a 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- server/vm/ASHandlers.cpp    4 Apr 2008 12:33:55 -0000       1.225
+++ server/vm/ASHandlers.cpp    4 Apr 2008 14:54:46 -0000       1.226
@@ -2446,7 +2446,7 @@
        }
        else
        {
-               log_debug("user-provided host requests fd is %d", hostfd);
+               //log_debug("user-provided host requests fd is %d", hostfd);
                std::stringstream request;
 
                // use the original url, non parsed (the browser will know 
better how to resolve relative urls and handle hactionscript)
@@ -2469,7 +2469,9 @@
                        log_error("Could only write %d bytes over "SIZET_FMT" 
required to user-provided host requests fd %d",
                                ret, len, hostfd);
                }
-               log_debug("Wrote %d bytes of geturl requests (all needed)", 
ret);
+               //log_debug("Wrote %d bytes of geturl requests (all needed)", 
ret);
+               requestString.resize(requestString.size()-1); // for sake of 
clean logging, should always end with newline
+               log_debug(_("Sent request '%s' to host fd %d"), requestString, 
hostfd);
        }
 
 }