# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1340615287 -7200
# Node ID f5ef195f348bfb2906d369a92256d4c4b0d7af7f
# Parent  04ecaffc8f8dd7f7e4233204f1f7c1a8f871df40
13.0.2 with adopted mozilla-prefer_plugin_pref.patch

diff -r 04ecaffc8f8d -r f5ef195f348b MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Jun 15 14:40:44 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Jun 25 11:08:07 2012 +0200
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jun 24 17:20:26 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 13.0.2
+- adopted mozilla-prefer_plugin_pref.patch to newest plugin loading
+  logic
+
 -------------------------------------------------------------------
 Fri Jun 15 12:37:09 UTC 2012 - wr@rosenauer.org
 
diff -r 04ecaffc8f8d -r f5ef195f348b MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Jun 15 14:40:44 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Jun 25 11:08:07 2012 +0200
@@ -18,7 +18,7 @@
 
 
 %define major 13
-%define mainver %major.0.1
+%define mainver %major.0.2
 %define update_channel release
 
 Name:           MozillaFirefox
@@ -49,7 +49,7 @@
 BuildRequires:  nss-shared-helper-devel
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012061400
+%define         releasedate 2012062300
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r 04ecaffc8f8d -r f5ef195f348b MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Fri Jun 15 14:40:44 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Mon Jun 25 11:08:07 2012 +0200
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_13_0_1_RELEASE"
-VERSION="13.0.1"
+RELEASE_TAG="FIREFOX_13_0_2_RELEASE"
+VERSION="13.0.2"
 
 # mozilla
 echo "cloning $BRANCH..."
diff -r 04ecaffc8f8d -r f5ef195f348b mozilla-prefer_plugin_pref.patch
--- a/mozilla-prefer_plugin_pref.patch	Fri Jun 15 14:40:44 2012 +0200
+++ b/mozilla-prefer_plugin_pref.patch	Mon Jun 25 11:08:07 2012 +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
-@@ -1580,17 +1580,48 @@ nsPluginHost::FindPluginForType(const ch
+@@ -1642,19 +1642,51 @@ nsPluginHost::FindPluginForType(const ch
                                  bool aCheckEnabled)
  {
    if (!aMimeType) {
@@ -24,12 +24,15 @@
 +
 +  if(!NS_SUCCEEDED(res)) preferredPluginPath = NULL;
 +
+   InfallibleTArray<nsPluginTag*> matchingPlugins;
+ 
    nsPluginTag *plugin = mPlugins;
++
 +  if(preferredPluginPath) {
 +    while (nsnull != plugin) {
 +      if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) ||
 +          0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) {
-+        return plugin;
++        matchingPlugins.AppendElement(plugin);
 +      }
 +      plugin = plugin->mNext;
 +    }
@@ -39,7 +42,7 @@
 +    while (nsnull != plugin) {
 +      if (nsnull != PL_strstr(plugin->mFileName.get(), preferredPluginPath) ||
 +          nsnull != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) {
-+        return plugin;
++        matchingPlugins.AppendElement(plugin);
 +      }
 +      plugin = plugin->mNext;
 +    }
@@ -50,6 +53,6 @@
        PRInt32 mimeCount = plugin->mMimeTypes.Length();
        for (PRInt32 i = 0; i < mimeCount; i++) {
          if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) {
-           return plugin;
+           matchingPlugins.AppendElement(plugin);
+           break;
          }
-       }