diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-12 16:34:33 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-12 16:34:33 +0100 |
| commit | 598dc50dbbba98cffc7719ff22fe1f41eeec268e (patch) | |
| tree | 2b97a1df614d01e5eb6b559559b7b7194f2bf2b0 | |
| parent | 26163d89884a6eadf66e15a8bf9e800aa960ba5f (diff) | |
| download | UXP-598dc50dbbba98cffc7719ff22fe1f41eeec268e.tar UXP-598dc50dbbba98cffc7719ff22fe1f41eeec268e.tar.gz UXP-598dc50dbbba98cffc7719ff22fe1f41eeec268e.tar.lz UXP-598dc50dbbba98cffc7719ff22fe1f41eeec268e.tar.xz UXP-598dc50dbbba98cffc7719ff22fe1f41eeec268e.zip | |
Remove leftover flashOnly checks in the plugin registry.
| -rw-r--r-- | dom/plugins/base/nsPluginHost.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index ca2871609..5fb265efc 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -2848,14 +2848,12 @@ nsPluginHost::WritePluginInfo() return rv; } - bool flashOnly = Preferences::GetBool("plugin.load_flash_only", true); - PR_fprintf(fd, "Generated File. Do not edit.\n"); PR_fprintf(fd, "\n[HEADER]\nVersion%c%s%c%c%c\nArch%c%s%c%c\n", PLUGIN_REGISTRY_FIELD_DELIMITER, kPluginRegistryVersion, - flashOnly ? 't' : 'f', + 'f', //flashOnly PLUGIN_REGISTRY_FIELD_DELIMITER, PLUGIN_REGISTRY_END_OF_LINE_MARKER, PLUGIN_REGISTRY_FIELD_DELIMITER, @@ -3052,9 +3050,8 @@ nsPluginHost::ReadPluginInfo() // If we're reading an old registry, ignore it // If we flipped the flash-only pref, ignore it - bool flashOnly = Preferences::GetBool("plugin.load_flash_only", true); nsAutoCString expectedVersion(kPluginRegistryVersion); - expectedVersion.Append(flashOnly ? 't' : 'f'); + expectedVersion.Append('f'); //flashOnly if (!expectedVersion.Equals(values[1])) { return rv; |