mozilla-central: changeset 206473:3047727d3621a4f1a8bbeb768a415c65d08c846c

author	Georg Fritzsche <georg.fritzsche@googlemail.com>
	Mon, 22 Sep 2014 12:02:48 +0200
changeset 206473	3047727d3621a4f1a8bbeb768a415c65d08c846c
parent 206472	377df57d2c8a680595e8628a8db07d7922061cab
child 206474	aa7d030e61897d1bfa2a622ce7beb048c24fe119
push id	27528
push user	ryanvm@gmail.com
push date	Mon, 22 Sep 2014 19:27:54 +0000
treeherder	mozilla-central@d8688cafc752 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bsmedberg
bugs	1051772
milestone	35.0a1
first release with	nightly linux32 790f41c631cc / 35.0a1 / 20140923030204 / files nightly linux64 790f41c631cc / 35.0a1 / 20140923030204 / files nightly mac 790f41c631cc / 35.0a1 / 20140923030204 / files nightly win32 790f41c631cc / 35.0a1 / 20140923030204 / files nightly win64 790f41c631cc / 35.0a1 / 20140923030204 / files
last release without	nightly linux32 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly linux64 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly mac 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly win32 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly win64 5bd6e09f074e / 35.0a1 / 20140922030204 / files

--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -692,22 +692,25 @@ pref("plugin.state.npciscowebcommunicato
 pref("plugin.state.ciscowebcommunicator", 2);
 #endif
 
 // McAfee Security Scanner detection plugin, bug 980772
 #ifdef XP_WIN
 pref("plugin.state.npmcafeemss", 2);
 #endif
 
-// Cisco VGConnect for directv.com, bug 981403
+// Cisco VGConnect for directv.com, bug 981403 & bug 1051772
 #ifdef XP_WIN
 pref("plugin.state.npplayerplugin", 2);
 #endif
 #ifdef XP_MACOSX
 pref("plugin.state.playerplugin", 2);
+pref("plugin.state.playerplugin.dtv", 2);
+pref("plugin.state.playerplugin.ciscodrm", 2);
+pref("plugin.state.playerplugin.charter", 2);
 #endif
 
 // Cisco Jabber Client, bug 981905
 #ifdef XP_WIN
 pref("plugin.state.npchip", 2);
 #endif
 #ifdef XP_MACOSX
 pref("plugin.state.cisco jabber guest plug-in", 2);