totem r5584 - in trunk: . browser-plugin

[hadess svn gnome org]

Author: hadess
Date: Wed Aug 20 10:48:45 2008
New Revision: 5584
URL: http://svn.gnome.org/viewvc/totem?rev=5584&view=rev

Log:
2008-08-20  Bastien Nocera  <hadess hadess net>

	* browser-plugin/totemPlugin.cpp:
	* browser-plugin/totemPluginGlue.cpp: Fix crummy
	descriptions for some mime-types, g_content_type_get_description
	always returns a description when the equivalent gnome-vfs
	function didn't for unknown types (Closes: #548301)



Modified:
   trunk/ChangeLog
   trunk/browser-plugin/totemPlugin.cpp
   trunk/browser-plugin/totemPluginGlue.cpp

Modified: trunk/browser-plugin/totemPlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemPlugin.cpp	(original)
+++ trunk/browser-plugin/totemPlugin.cpp	Wed Aug 20 10:48:45 2008
@@ -88,7 +88,7 @@
 
 static const totemPluginMimeEntry kMimeTypes[] = {
 #if defined(TOTEM_BASIC_PLUGIN)
-  { "application/x-ogg","ogg",NULL },
+  { "application/x-ogg","ogg","application/ogg" },
   { "application/ogg", "ogg", NULL },
   { "audio/ogg", "oga", NULL },
   { "audio/x-ogg", "ogg", NULL },
@@ -103,7 +103,7 @@
   { "audio/mpeg", "mp3", NULL },
   { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
   { "video/flv", "flv", "application/x-flash-video" },
-  { "application/x-totem-plugin", "", "application/octet-stream" },
+  { "application/x-totem-plugin", "", "Totem Multimedia plugin" },
 #elif defined(TOTEM_GMP_PLUGIN)
   { "application/x-mplayer2", "avi, wma, wmv", "video/x-msvideo" },
   { "video/x-ms-asf-plugin", "asf, wmv", "video/x-ms-asf" },
@@ -128,9 +128,9 @@
 #elif defined(TOTEM_MULLY_PLUGIN)
   { "video/divx", "divx", "video/x-msvideo" },
 #elif defined(TOTEM_CONE_PLUGIN)
-  { "application/x-vlc-plugin", "", "application/octet-stream" },
-  { "application/vlc", "", "application/octet-stream" },
-  { "video/x-google-vlc-plugin", "", "application/octet-stream" },
+  { "application/x-vlc-plugin", "", "VLC Multimedia Plugin" },
+  { "application/vlc", "", "VLC Multimedia Plugin" },
+  { "video/x-google-vlc-plugin", "", "VLC Multimedia Plugin" },
 #else
 #error Unknown plugin type
 #endif

Modified: trunk/browser-plugin/totemPluginGlue.cpp
==============================================================================
--- trunk/browser-plugin/totemPluginGlue.cpp	(original)
+++ trunk/browser-plugin/totemPluginGlue.cpp	Wed Aug 20 10:48:45 2008
@@ -357,19 +357,23 @@
 		if (totem_plugin_mimetype_is_disabled (mimetypes[i].mimetype, system, user))
 			continue;
 
-		desc = g_content_type_get_description (mimetypes[i].mimetype);
-		if (desc == NULL && mimetypes[i].mime_alias != NULL) {
-			desc = g_content_type_get_description
-				(mimetypes[i].mime_alias);
-		}
-		if (desc == NULL) {
-			desc = g_strdup (mimetypes[i].mime_alias);
+		desc = NULL;
+		if (mimetypes[i].mime_alias != NULL) {
+			if (strstr (mimetypes[i].mime_alias, "/") != NULL) {
+				desc = g_content_type_get_description
+					(mimetypes[i].mime_alias);
+			} else {
+				desc = g_strdup (mimetypes[i].mime_alias);
+			}
 		}
 
+		if (desc == NULL)
+			desc = g_content_type_get_description (mimetypes[i].mimetype);
+
 		g_string_append_printf (list,"%s:%s:%s;",
 					mimetypes[i].mimetype,
 					mimetypes[i].extensions,
-					desc ? desc : "-");
+					desc);
 		g_free (desc);
 	}