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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/18 16:48:43

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 

Log message:
                * plugin/plugin.cpp: Use the environmental variable
                  GNASH_PLUGIN_DESCRIPTION for the plugin description
                  (when set).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4032&r2=1.4033
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4032
retrieving revision 1.4033
diff -u -b -r1.4032 -r1.4033
--- ChangeLog   18 Aug 2007 16:14:00 -0000      1.4032
+++ ChangeLog   18 Aug 2007 16:48:43 -0000      1.4033
@@ -1,5 +1,11 @@
 2007-08-18 Sandro Santilli <address@hidden>
 
+       * plugin/plugin.cpp: Use the environmental variable
+         GNASH_PLUGIN_DESCRIPTION for the plugin description
+         (when set).
+
+2007-08-18 Sandro Santilli <address@hidden>
+
        * server/video_stream_instance.cpp: mark characters created
          using new Video as dynamic.
        * server/character.h (isDynamic): remove bogus assertion

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- plugin/plugin.cpp   18 Aug 2007 12:24:40 -0000      1.83
+++ plugin/plugin.cpp   18 Aug 2007 16:48:43 -0000      1.84
@@ -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.83 2007/08/18 12:24:40 strk Exp $ */
+/* $Id: plugin.cpp,v 1.84 2007/08/18 16:48:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -78,6 +78,8 @@
 
 static bool  waitforgdb = false;
 
+static const char* getPluginDescription();
+
 void
 PR_CALLBACK Destructor(void * /* data */)
 {
@@ -192,7 +194,7 @@
       // This becomes the description field you see below the opening
       // text when you type about:plugins
       case NPPVpluginDescriptionString:
-          *static_cast<char **>(aValue) = PLUGIN_DESCRIPTION;
+          *static_cast<const char **>(aValue) = getPluginDescription();
           break;
 
       case NPPVpluginNeedsXEmbed:
@@ -693,6 +695,17 @@
         return propValue.utf8characters; // const char *
 }
 
+static const char* getPluginDescription() 
+{
+       static const char* desc = NULL;
+       if ( ! desc )
+       {
+               desc = getenv("GNASH_PLUGIN_DESCRIPTION");
+               if ( ! desc ) desc = PLUGIN_DESCRIPTION;
+       }
+       return desc;
+}
+
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t