[Gnash-commit] gnash ChangeLog plugin/plugin.cpp server/vm/VM.cpp [release_0_8_1]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_1
Changes by:     Sandro Santilli <strk>  07/08/17 14:02:40

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 
        server/vm      : VM.cpp 

Log message:
        Patch #6151 by Benjamin Wolsey <address@hidden>:
        
                * server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as
                  a compatibility version for use by $version or
                  System.capabilities.version based version detection kits.
                  (TODO items added for a cleaner handling of this).
                * plugin/plugin.cpp: define FLASH_VERSION as a compatibility 
version
                  for use by javascript-based flash version detection kits.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.20&r2=1.3971.2.21
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.81&r2=1.81.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.12&r2=1.12.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.20
retrieving revision 1.3971.2.21
diff -u -b -r1.3971.2.20 -r1.3971.2.21
--- ChangeLog   16 Aug 2007 23:25:53 -0000      1.3971.2.20
+++ ChangeLog   17 Aug 2007 14:02:38 -0000      1.3971.2.21
@@ -1,3 +1,12 @@
+2007-08-17 Benjamin Wolsey <address@hidden>
+
+       * server/vm/VM.cpp (getPlayerVersion): define FLASH_VERSION as
+         a compatibility version for use by $version or
+         System.capabilities.version based version detection kits.
+         (TODO items added for a cleaner handling of this).
+       * plugin/plugin.cpp: define FLASH_VERSION as a compatibility version
+         for use by javascript-based flash version detection kits.
+
 2007-08-13  Alfred M. Szmidt  <address@hidden>
 
        * configure.ac: State that a <= 2.4 version of AGG is an error.

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.81
retrieving revision 1.81.2.1
diff -u -b -r1.81 -r1.81.2.1
--- plugin/plugin.cpp   8 Aug 2007 20:51:39 -0000       1.81
+++ plugin/plugin.cpp   17 Aug 2007 14:02:39 -0000      1.81.2.1
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.81 2007/08/08 20:51:39 strk Exp $ */
+/* $Id: plugin.cpp,v 1.81.2.1 2007/08/17 14:02:39 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -27,15 +27,22 @@
 #define PLUGIN_NAME     "Shockwave Flash"
 #define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
 
+//Some javascript plugin detectors use the description
+//to decide the flash version to display. They expect the
+//form (major version).(minor version) r(revision).
+#define FLASH_VERSION "8.0 r99."
+
 #define PLUGIN_DESCRIPTION \
-  "Shockwave Flash 8.0 - Gnash " VERSION ", the GNU Flash Player. Copyright   \
-  &copy; 2006 <a href=\"http://www.fsf.org\";>Free Software Foundation</a>,    \
-  Inc.<br> Gnash comes with NO WARRANTY, to the extent permitted by law.  You \
-  may redistribute copies of Gnash under the terms of the                     \
-  <a href=\"http://www.gnu.org/licenses/gpl.html\";>GNU General Public License \
-  </a>. For more information about Gnash, see <a \
+  "Shockwave Flash "FLASH_VERSION" Gnash "VERSION", the GNU Flash Player. \
+  Copyright &copy; 2006 <a href=\"http://www.fsf.org\";>Free Software \
+  Foundation</a>, Inc. <br> \
+  Gnash comes with NO WARRANTY, to the extent permitted by law. \
+  You may redistribute copies of Gnash under the terms of the \
+  <a href=\"http://www.gnu.org/licenses/gpl.html\";>GNU General Public \
+  License</a>. For more information about Gnash, see <a \
   href=\"http://www.gnu.org/software/gnash/\";> \
-  http://www.gnu.org/software/gnash</a>. Compatible Shockwave Flash 8.0 r99."
+  http://www.gnu.org/software/gnash</a>. \
+  Compatible Shockwave Flash "FLASH_VERSION
 
 #include <sys/param.h>
 #include "plugin.h" //Fixes Warning on redef of MIN/MAX

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -b -r1.12 -r1.12.2.1
--- server/vm/VM.cpp    1 Aug 2007 15:56:54 -0000       1.12
+++ server/vm/VM.cpp    17 Aug 2007 14:02:40 -0000      1.12.2.1
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.12 2007/08/01 15:56:54 strk Exp $ */
+/* $Id: VM.cpp,v 1.12.2.1 2007/08/17 14:02:40 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -104,11 +104,16 @@
 const std::string&
 VM::getPlayerVersion() const
 {
-       // TODO: find a "compatible" representation so that
-       //       player version checkers (javascript or similar)
-       //       will accept Gnash as a working player.
+       // Expected Form: UNIX|WIN|WINCE|MAC (major version),(minor 
version),(revision),0
+       //    Used in _ActionScript_ version detection, not Javascript
+       //    ActionScript detection often looks for the commas, so
+       //    the last ,0 is necessary, even if it doesn't appear
+       //    to mean anything.
        //       
-       static const std::string version("Gnash-" VERSION);
+       // TODO: use config.h for the default, query RcInit file for an override
+       //
+#define FLASH_VERSION "GSH 8,0,99,0"
+       static const std::string version(FLASH_VERSION);
        return version;
 }