[Gnash-commit] gnash/gui Makefile.am gnash.cpp gtk.cpp gtk_glu...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/05/12 04:34:52

Modified files:
        gui            : Makefile.am gnash.cpp gtk.cpp 
                         gtk_glue_cairo.cpp gtk_glue_cairo.h 
                         gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h 
                         gtksup.h gui.cpp gui.h sdl.cpp sdlsup.h 

Log message:
        Update to latest version of the Mozilla exemption.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gnash.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk_glue_cairo.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk_glue_cairo.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk_glue_gtkglext.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk_glue_gtkglext.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtksup.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gui.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gui.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/sdl.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/sdlsup.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/gui/Makefile.am
diff -u gnash/gui/Makefile.am:1.3 gnash/gui/Makefile.am:1.4
--- gnash/gui/Makefile.am:1.3   Fri May 12 00:23:04 2006
+++ gnash/gui/Makefile.am       Fri May 12 04:34:49 2006
@@ -14,27 +14,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 
-# Linking Gnash statically or dynamically with other modules is making
-# a combined work based on Gnash. Thus, the terms and conditions of
-# the GNU General Public License cover the whole combination.
-# 
-# In addition, as a special exception, the copyright holders of Gnash give
-# you permission to combine Gnash with free software programs or
-# libraries that are released under the GNU LGPL and/or with Mozilla, 
-# so long as the linking with Mozilla, or any variant of Mozilla, is
-# through its standard plug-in interface. You may copy and distribute
-# such a system following the terms of the GNU GPL for Gnash and the
-# licenses of the other code concerned, provided that you include the
-# source code of that other code when and as the GNU GPL requires
-# distribution of source code. 
-# 
+
+# Linking Gnash statically or dynamically with other modules is making a
+# combined work based on Gnash. Thus, the terms and conditions of the GNU
+# General Public License cover the whole combination.
+#
+# As a special exception, the copyright holders of Gnash give you
+# permission to combine Gnash with free software programs or libraries
+# that are released under the GNU LGPL and with code included in any
+# release of Talkback distributed by the Mozilla Foundation. You may
+# copy and distribute such a system following the terms of the GNU GPL
+# for all but the LGPL-covered parts and Talkback, and following the
+# LGPL for the LGPL-covered parts.
+#
 # Note that people who make modified versions of Gnash are not obligated
-# to grant this special exception for their modified versions; it is
-# their choice whether to do so.  The GNU General Public License gives
-# permission to release a modified version without this exception; this
-# exception also makes it possible to release a modified version which
-# carries forward this exception.
+# to grant this special exception for their modified versions; it is their
+# choice whether to do so. The GNU General Public License gives permission
+# to release a modified version without this exception; this exception
+# also makes it possible to release a modified version which carries
+# forward this exception.
+# 
 #
 
 AUTOMAKE_OPTIONS =
Index: gnash/gui/gnash.cpp
diff -u gnash/gui/gnash.cpp:1.7 gnash/gui/gnash.cpp:1.8
--- gnash/gui/gnash.cpp:1.7     Fri May 12 00:23:04 2006
+++ gnash/gui/gnash.cpp Fri May 12 04:34:51 2006
@@ -13,27 +13,27 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-// 
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-// 
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
-// 
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+
+// 
 //
 
 #ifdef HAVE_CONFIG_H
Index: gnash/gui/gtk.cpp
diff -u gnash/gui/gtk.cpp:1.7 gnash/gui/gtk.cpp:1.8
--- gnash/gui/gtk.cpp:1.7       Fri May 12 00:23:04 2006
+++ gnash/gui/gtk.cpp   Fri May 12 04:34:51 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-// 
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-// 
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
-// 
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
 //
 
 #ifdef HAVE_CONFIG_H
Index: gnash/gui/gtk_glue_cairo.cpp
diff -u gnash/gui/gtk_glue_cairo.cpp:1.1 gnash/gui/gtk_glue_cairo.cpp:1.2
--- gnash/gui/gtk_glue_cairo.cpp:1.1    Fri May 12 00:18:56 2006
+++ gnash/gui/gtk_glue_cairo.cpp        Fri May 12 04:34:51 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
 //
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-//
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
 //
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+//
 //
 
 #include "gtk_glue_cairo.h"
Index: gnash/gui/gtk_glue_cairo.h
diff -u gnash/gui/gtk_glue_cairo.h:1.1 gnash/gui/gtk_glue_cairo.h:1.2
--- gnash/gui/gtk_glue_cairo.h:1.1      Fri May 12 00:18:56 2006
+++ gnash/gui/gtk_glue_cairo.h  Fri May 12 04:34:51 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
 //
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-//
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
 //
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+//
 //
 
 #include "gtk_glue.h"
Index: gnash/gui/gtk_glue_gtkglext.cpp
diff -u gnash/gui/gtk_glue_gtkglext.cpp:1.1 gnash/gui/gtk_glue_gtkglext.cpp:1.2
--- gnash/gui/gtk_glue_gtkglext.cpp:1.1 Fri May 12 00:18:56 2006
+++ gnash/gui/gtk_glue_gtkglext.cpp     Fri May 12 04:34:51 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
 //
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-//
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
 //
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+//
 //
 
 #include "gtk_glue_gtkglext.h"
Index: gnash/gui/gtk_glue_gtkglext.h
diff -u gnash/gui/gtk_glue_gtkglext.h:1.1 gnash/gui/gtk_glue_gtkglext.h:1.2
--- gnash/gui/gtk_glue_gtkglext.h:1.1   Fri May 12 00:18:56 2006
+++ gnash/gui/gtk_glue_gtkglext.h       Fri May 12 04:34:51 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
 //
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-//
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
 //
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+//
 //
 
 #include "gtk_glue.h"
Index: gnash/gui/gtksup.h
diff -u gnash/gui/gtksup.h:1.6 gnash/gui/gtksup.h:1.7
--- gnash/gui/gtksup.h:1.6      Fri May 12 00:23:04 2006
+++ gnash/gui/gtksup.h  Fri May 12 04:34:51 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-// 
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-// 
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
-// 
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
 //
 
 #ifndef __GTKSUP_H__
Index: gnash/gui/gui.cpp
diff -u gnash/gui/gui.cpp:1.3 gnash/gui/gui.cpp:1.4
--- gnash/gui/gui.cpp:1.3       Wed May 10 01:45:50 2006
+++ gnash/gui/gui.cpp   Fri May 12 04:34:51 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-// 
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-// 
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
-// 
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
 //
 
 #ifdef HAVE_CONFIG_H
Index: gnash/gui/gui.h
diff -u gnash/gui/gui.h:1.3 gnash/gui/gui.h:1.4
--- gnash/gui/gui.h:1.3 Fri May 12 00:23:04 2006
+++ gnash/gui/gui.h     Fri May 12 04:34:52 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-// 
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-// 
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
-// 
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
 //
 
 #ifndef _GUI_H_
Index: gnash/gui/sdl.cpp
diff -u gnash/gui/sdl.cpp:1.4 gnash/gui/sdl.cpp:1.5
--- gnash/gui/sdl.cpp:1.4       Fri May 12 00:23:04 2006
+++ gnash/gui/sdl.cpp   Fri May 12 04:34:52 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-// 
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-// 
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
-// 
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
 //
 
 #ifdef HAVE_CONFIG_H
Index: gnash/gui/sdlsup.h
diff -u gnash/gui/sdlsup.h:1.2 gnash/gui/sdlsup.h:1.3
--- gnash/gui/sdlsup.h:1.2      Fri May 12 00:23:04 2006
+++ gnash/gui/sdlsup.h  Fri May 12 04:34:52 2006
@@ -13,27 +13,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-// 
-// Linking Gnash statically or dynamically with other modules is making
-// a combined work based on Gnash. Thus, the terms and conditions of
-// the GNU General Public License cover the whole combination.
-// 
-// In addition, as a special exception, the copyright holders of Gnash give
-// you permission to combine Gnash with free software programs or
-// libraries that are released under the GNU LGPL and/or with Mozilla, 
-// so long as the linking with Mozilla, or any variant of Mozilla, is
-// through its standard plug-in interface. You may copy and distribute
-// such a system following the terms of the GNU GPL for Gnash and the
-// licenses of the other code concerned, provided that you include the
-// source code of that other code when and as the GNU GPL requires
-// distribution of source code. 
-// 
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
 // Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is
-// their choice whether to do so.  The GNU General Public License gives
-// permission to release a modified version without this exception; this
-// exception also makes it possible to release a modified version which
-// carries forward this exception.
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
 //
 
 #ifndef __SDLSUP_H__