--- a/mozilla-prefer_plugin_pref.patch	Thu May 30 09:22:10 2013 +0200
+++ b/mozilla-prefer_plugin_pref.patch	Wed Jun 12 21:15:08 2013 +0200
@@ -4,7 +4,7 @@
 diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
 --- a/dom/plugins/base/nsPluginHost.cpp
 +++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -1543,17 +1543,51 @@ nsPluginHost::FindPluginForType(const ch
+@@ -1334,17 +1334,51 @@ nsPluginHost::FindPluginForType(const ch
    if (!aMimeType) {
      return nullptr;
    }
@@ -13,7 +13,7 @@
  
    InfallibleTArray<nsPluginTag*> matchingPlugins;
  
-+  char *preferredPluginPath = NULL;
++  char *preferredPluginPath = nullptr;
 +  nsAutoCString mimetypePrefString ("modules.plugins.mimetype.");
 +  mimetypePrefString.Append(aMimeType);
 +  const char *mimetypePrefChar = mimetypePrefString.get();
@@ -49,7 +49,7 @@
 +  }
 +
    while (plugin) {
-     if (!aCheckEnabled || plugin->IsEnabled()) {
+     if (!aCheckEnabled || plugin->IsActive()) {
        int32_t mimeCount = plugin->mMimeTypes.Length();
        for (int32_t i = 0; i < mimeCount; i++) {
          if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) {