totem r5078 - in trunk: . browser-plugin

[hadess svn gnome org]

Author: hadess
Date: Thu Feb  7 16:15:32 2008
New Revision: 5078
URL: http://svn.gnome.org/viewvc/totem?rev=5078&view=rev

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

	* browser-plugin/totem-plugin-viewer.c: (totem_embedded_construct):
	Don't try to load the logo if we're hidden
	* browser-plugin/totemPlugin.cpp: Match the tiny width/height hacks
	to hide a plugin used in Mozilla, fixes the Sirius Radio streams
	never calling SetWindow() (Closes: #494680)



Modified:
   trunk/ChangeLog
   trunk/browser-plugin/totem-plugin-viewer.c
   trunk/browser-plugin/totemPlugin.cpp

Modified: trunk/browser-plugin/totem-plugin-viewer.c
==============================================================================
--- trunk/browser-plugin/totem-plugin-viewer.c	(original)
+++ trunk/browser-plugin/totem-plugin-viewer.c	Thu Feb  7 16:15:32 2008
@@ -1947,7 +1947,7 @@
 			totem_embedded_set_logo_by_name (emb, "gtk-media-play-ltr");
 		else
 			totem_embedded_set_logo_by_name (emb, "gtk-media-play-rtl");
-	} else {
+	} else if (!emb->hidden) {
 		totem_embedded_set_logo_by_name (emb, "totem");
 	}
 

Modified: trunk/browser-plugin/totemPlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemPlugin.cpp	(original)
+++ trunk/browser-plugin/totemPlugin.cpp	Thu Feb  7 16:15:32 2008
@@ -1726,10 +1726,10 @@
 	mHidden = g_hash_table_lookup (args, "hidden") != NULL &&
 		  GetBooleanValue (args, "hidden", PR_TRUE);
 
-	/* Most for RealAudio streams, but also used as a replacement for
-	 * HIDDEN=TRUE attribute.
+	/* Used as a replacement for HIDDEN=TRUE attribute.
+	 * See http://mxr.mozilla.org/mozilla/source/modules/plugin/base/src/ns4xPluginInstance.cpp#1135
 	 */
-	if (width == 0 && height == 0)
+	if (width <= 0 || height <= 0)
 		mHidden = PR_TRUE;
 
 	/* Whether to automatically stream and play the content */