totem r5065 - in trunk: . browser-plugin

[hadess svn gnome org]

Author: hadess
Date: Mon Feb  4 14:32:50 2008
New Revision: 5065
URL: http://svn.gnome.org/viewvc/totem?rev=5065&view=rev

Log:
2008-02-04  Bastien Nocera  <hadess hadess net>

	* browser-plugin/totemBasicPlugin.cpp:
	* browser-plugin/totemBasicPlugin.h:
	* browser-plugin/totemComplexPlugin.cpp:
	* browser-plugin/totemComplexPlugin.h:
	* browser-plugin/totemConePlugin.cpp:
	* browser-plugin/totemConePlugin.h:
	* browser-plugin/totemGMPPlugin.cpp:
	* browser-plugin/totemGMPPlugin.h:
	* browser-plugin/totemMullYPlugin.cpp:
	* browser-plugin/totemMullYPlugin.h:
	* browser-plugin/totemNarrowSpacePlugin.cpp:
	* browser-plugin/totemNarrowSpacePlugin.h:
	* browser-plugin/totemPlugin.h:
	* browser-plugin/totemPluginGlue.cpp:
	Add a PluginLongDescription function to all the plugins,
	and return a custom description in the DivX plugin, so
	stage6.com stops complaining that we have an old version



Modified:
   trunk/ChangeLog
   trunk/browser-plugin/totemBasicPlugin.cpp
   trunk/browser-plugin/totemBasicPlugin.h
   trunk/browser-plugin/totemComplexPlugin.cpp
   trunk/browser-plugin/totemComplexPlugin.h
   trunk/browser-plugin/totemConePlugin.cpp
   trunk/browser-plugin/totemConePlugin.h
   trunk/browser-plugin/totemGMPPlugin.cpp
   trunk/browser-plugin/totemGMPPlugin.h
   trunk/browser-plugin/totemMullYPlugin.cpp
   trunk/browser-plugin/totemMullYPlugin.h
   trunk/browser-plugin/totemNarrowSpacePlugin.cpp
   trunk/browser-plugin/totemNarrowSpacePlugin.h
   trunk/browser-plugin/totemPlugin.h
   trunk/browser-plugin/totemPluginGlue.cpp

Modified: trunk/browser-plugin/totemBasicPlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemBasicPlugin.cpp	(original)
+++ trunk/browser-plugin/totemBasicPlugin.cpp	Mon Feb  4 14:32:50 2008
@@ -83,6 +83,12 @@
   return (char*) kPluginDescription;
 }
 
+/* static */ char *
+totemScriptablePlugin::PluginLongDescription ()
+{
+  return (char*) totem_plugin_get_long_description();
+}
+
 /* static */ void
 totemScriptablePlugin::PluginMimeTypes (const totemPluginMimeEntry **_entries,
 					PRUint32 *_count)

Modified: trunk/browser-plugin/totemBasicPlugin.h
==============================================================================
--- trunk/browser-plugin/totemBasicPlugin.h	(original)
+++ trunk/browser-plugin/totemBasicPlugin.h	Mon Feb  4 14:32:50 2008
@@ -43,6 +43,7 @@
     void SetPlugin (totemPlugin *aPlugin) { mPlugin = aPlugin; }
 
     static char *PluginDescription ();
+    static char *PluginLongDescription();
     static void PluginMimeTypes (const totemPluginMimeEntry **, PRUint32 *);
   private:
     ~totemScriptablePlugin ();

Modified: trunk/browser-plugin/totemComplexPlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemComplexPlugin.cpp	(original)
+++ trunk/browser-plugin/totemComplexPlugin.cpp	Mon Feb  4 14:32:50 2008
@@ -85,6 +85,12 @@
   return (char*) kPluginDescription;
 }
 
+/* static */ char *
+totemScriptablePlugin::PluginLongDescription ()
+{
+  return (char*) totem_plugin_get_long_description();
+}
+
 /* static */ void
 totemScriptablePlugin::PluginMimeTypes (const totemPluginMimeEntry **_entries,
 					PRUint32 *_count)

Modified: trunk/browser-plugin/totemComplexPlugin.h
==============================================================================
--- trunk/browser-plugin/totemComplexPlugin.h	(original)
+++ trunk/browser-plugin/totemComplexPlugin.h	Mon Feb  4 14:32:50 2008
@@ -45,6 +45,7 @@
     void SetPlugin (totemPlugin *aPlugin) { mPlugin = aPlugin; }
 
     static char *PluginDescription ();
+    static char *PluginLongDescription();
     static void PluginMimeTypes (const totemPluginMimeEntry **, PRUint32 *);
   private:
     ~totemScriptablePlugin ();

Modified: trunk/browser-plugin/totemConePlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemConePlugin.cpp	(original)
+++ trunk/browser-plugin/totemConePlugin.cpp	Mon Feb  4 14:32:50 2008
@@ -73,6 +73,12 @@
   return (char*) kPluginDescription;
 }
 
+/* static */ char *
+totemScriptablePlugin::PluginLongDescription ()
+{
+  return (char*) totem_plugin_get_long_description();
+}
+
 /* static */ void
 totemScriptablePlugin::PluginMimeTypes (const totemPluginMimeEntry **_entries,
 					PRUint32 *_count)

Modified: trunk/browser-plugin/totemConePlugin.h
==============================================================================
--- trunk/browser-plugin/totemConePlugin.h	(original)
+++ trunk/browser-plugin/totemConePlugin.h	Mon Feb  4 14:32:50 2008
@@ -43,6 +43,7 @@
     void SetPlugin (totemPlugin *aPlugin) { mPlugin = aPlugin; }
 
     static char *PluginDescription ();
+    static char *PluginLongDescription();
     static void PluginMimeTypes (const totemPluginMimeEntry **, PRUint32 *);
   private:
     ~totemScriptablePlugin ();

Modified: trunk/browser-plugin/totemGMPPlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemGMPPlugin.cpp	(original)
+++ trunk/browser-plugin/totemGMPPlugin.cpp	Mon Feb  4 14:32:50 2008
@@ -101,6 +101,12 @@
   return (char*) kPluginDescription;
 }
 
+/* static */ char *
+totemScriptablePlugin::PluginLongDescription ()
+{
+  return (char*) totem_plugin_get_long_description();
+}
+
 /* static */ void
 totemScriptablePlugin::PluginMimeTypes (const totemPluginMimeEntry **_entries,
 					PRUint32 *_count)

Modified: trunk/browser-plugin/totemGMPPlugin.h
==============================================================================
--- trunk/browser-plugin/totemGMPPlugin.h	(original)
+++ trunk/browser-plugin/totemGMPPlugin.h	Mon Feb  4 14:32:50 2008
@@ -53,6 +53,7 @@
     void SetPlugin (totemPlugin *aPlugin) { mPlugin = aPlugin; }
 
     static char *PluginDescription ();
+    static char *PluginLongDescription();
     static void PluginMimeTypes (const totemPluginMimeEntry **, PRUint32 *);
   private:
     friend class totemGMPSettings;

Modified: trunk/browser-plugin/totemMullYPlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemMullYPlugin.cpp	(original)
+++ trunk/browser-plugin/totemMullYPlugin.cpp	Mon Feb  4 14:32:50 2008
@@ -49,6 +49,7 @@
 
 static const char kClassDescription[] = "totemMullYPlugin";
 static const char kPluginDescription[] = "DivX\xC2\xAE Web Player";
+static const char kPluginLongDescription[] = "DivX Web Player version 1.4.0.233";
 
 static const totemPluginMimeEntry kMimeTypes[] = {
 	{ "video/divx", "divx", "video/x-msvideo" },
@@ -71,6 +72,12 @@
   return (char*) kPluginDescription;
 }
 
+/* static */ char *
+totemScriptablePlugin::PluginLongDescription ()
+{
+  return (char*) kPluginLongDescription;
+}
+
 /* static */ void
 totemScriptablePlugin::PluginMimeTypes (const totemPluginMimeEntry **_entries,
 					PRUint32 *_count)

Modified: trunk/browser-plugin/totemMullYPlugin.h
==============================================================================
--- trunk/browser-plugin/totemMullYPlugin.h	(original)
+++ trunk/browser-plugin/totemMullYPlugin.h	Mon Feb  4 14:32:50 2008
@@ -44,6 +44,7 @@
     void SetPlugin (totemPlugin *aPlugin) { mPlugin = aPlugin; }
 
     static char *PluginDescription ();
+    static char *PluginLongDescription();
     static void PluginMimeTypes (const totemPluginMimeEntry **, PRUint32 *);
   private:
     ~totemScriptablePlugin ();

Modified: trunk/browser-plugin/totemNarrowSpacePlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemNarrowSpacePlugin.cpp	(original)
+++ trunk/browser-plugin/totemNarrowSpacePlugin.cpp	Mon Feb  4 14:32:50 2008
@@ -88,6 +88,12 @@
   return (char*) kPluginDescription;
 }
 
+/* static */ char *
+totemScriptablePlugin::PluginLongDescription ()
+{
+  return (char*) totem_plugin_get_long_description();
+}
+
 /* static */ void
 totemScriptablePlugin::PluginMimeTypes (const totemPluginMimeEntry **_entries,
 					PRUint32 *_count)

Modified: trunk/browser-plugin/totemNarrowSpacePlugin.h
==============================================================================
--- trunk/browser-plugin/totemNarrowSpacePlugin.h	(original)
+++ trunk/browser-plugin/totemNarrowSpacePlugin.h	Mon Feb  4 14:32:50 2008
@@ -45,6 +45,7 @@
     void SetPlugin (totemPlugin *aPlugin) { mPlugin = aPlugin; }
 
     static char *PluginDescription ();
+    static char *PluginLongDescription();
     static void PluginMimeTypes (const totemPluginMimeEntry **, PRUint32 *);
 
     enum PluginState {

Modified: trunk/browser-plugin/totemPlugin.h
==============================================================================
--- trunk/browser-plugin/totemPlugin.h	(original)
+++ trunk/browser-plugin/totemPlugin.h	Mon Feb  4 14:32:50 2008
@@ -297,4 +297,6 @@
   const char *mime_alias;
 } totemPluginMimeEntry;
 
+char *totem_plugin_get_long_description (void);
+
 #endif /* __TOTEM_PLUGIN_H__ */

Modified: trunk/browser-plugin/totemPluginGlue.cpp
==============================================================================
--- trunk/browser-plugin/totemPluginGlue.cpp	(original)
+++ trunk/browser-plugin/totemPluginGlue.cpp	Mon Feb  4 14:32:50 2008
@@ -203,8 +203,8 @@
 	D ("Print");
 }
 
-static char *
-totem_plugin_get_description (void)
+char *
+totem_plugin_get_long_description (void)
 {
 	return "The <a href=\"http://www.gnome.org/projects/totem/\";>Totem</a> " PACKAGE_VERSION " plugin handles video and audio streams.";
 }
@@ -229,7 +229,7 @@
 		*((char **)value) = totemScriptablePlugin::PluginDescription ();
 		break;
 	case NPPVpluginDescriptionString:
-		*((char **)value) = totem_plugin_get_description();
+		*((char **)value) = totemScriptablePlugin::PluginLongDescription ();
 		break;
 	case NPPVpluginNeedsXEmbed:
 		*((NPBool *)value) = TRUE;