rpms/firefox/FC-4 firefox-1.0-imgloader-comarray.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 firefox.spec, 1.73, 1.74 sources, 1.13, 1.14

[fedora-cvs-commits redhat com]

Author: caillon

Update of /cvs/dist/rpms/firefox/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29772

Modified Files:
	.cvsignore firefox.spec sources 
Added Files:
	firefox-1.0-imgloader-comarray.patch 
Log Message:
* Mon Jul 18 2005 Christopher Aillon <caillon redhat com> 0:1.0.6-0.1.fc4
- 1.0.6 Release Candidate


firefox-1.0-imgloader-comarray.patch:
 imgLoader.cpp |   16 +++++-----------
 imgLoader.h   |    4 ++--
 2 files changed, 7 insertions(+), 13 deletions(-)

--- NEW FILE firefox-1.0-imgloader-comarray.patch ---
Index: modules/libpr0n/src/imgLoader.cpp
===================================================================
RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.cpp,v
retrieving revision 1.78.2.2
diff -d -u -p -r1.78.2.2 imgLoader.cpp
--- modules/libpr0n/src/imgLoader.cpp	16 Aug 2004 18:06:37 -0000	1.78.2.2
+++ modules/libpr0n/src/imgLoader.cpp	15 Jul 2005 04:31:06 -0000
@@ -896,7 +896,7 @@ void imgCacheValidator::AddProxy(imgRequ
   // the network.
   aProxy->AddToLoadGroup();
 
-  mProxies.AppendElement(aProxy);
+  mProxies.AppendObject(aProxy);
 }
 
 /** nsIRequestObserver methods **/
@@ -909,13 +909,10 @@ NS_IMETHODIMP imgCacheValidator::OnStart
     PRBool isFromCache;
     if (NS_SUCCEEDED(cacheChan->IsFromCache(&isFromCache)) && isFromCache) {
 
-      PRUint32 count;
-      mProxies.Count(&count);
+      PRUint32 count = mProxies.Count();
       for (PRInt32 i = count-1; i>=0; i--) {
-        imgRequestProxy *proxy;
-        mProxies.GetElementAt(i, (nsISupports**)&proxy);
+        imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
         mRequest->NotifyProxyListener(proxy);
-        NS_RELEASE(proxy);
       }
 
       mRequest->SetLoadId(mContext);
@@ -964,14 +961,11 @@ NS_IMETHODIMP imgCacheValidator::OnStart
 
   mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
 
-  PRUint32 count;
-  mProxies.Count(&count);
+  PRUint32 count = mProxies.Count();
   for (PRInt32 i = count-1; i>=0; i--) {
-    imgRequestProxy *proxy;
-    mProxies.GetElementAt(i, (nsISupports**)&proxy);
+    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
     proxy->ChangeOwner(request);
     request->NotifyProxyListener(proxy);
-    NS_RELEASE(proxy);
   }
 
   NS_RELEASE(request);
Index: modules/libpr0n/src/imgLoader.h
===================================================================
RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.h,v
retrieving revision 1.10.38.1
diff -d -u -p -r1.10.38.1 imgLoader.h
--- modules/libpr0n/src/imgLoader.h	16 Aug 2004 18:06:37 -0000	1.10.38.1
+++ modules/libpr0n/src/imgLoader.h	15 Jul 2005 04:31:06 -0000
@@ -90,7 +90,7 @@ private:
  * validate checker
  */
 
-#include "nsSupportsArray.h"
+#include "nsCOMArray.h"
 
 class imgCacheValidator : public nsIStreamListener
 {
@@ -109,7 +109,7 @@ private:
   nsCOMPtr<nsIStreamListener> mDestListener;
 
   imgRequest *mRequest;
-  nsSupportsArray mProxies;
+  nsCOMArray<imgIRequest> mProxies;
 
   void *mContext;
 };


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 May 2005 15:52:02 -0000	1.12
+++ .cvsignore	18 Jul 2005 22:13:14 -0000	1.13
@@ -9,3 +9,4 @@
 firefox-1.0.2-source.tar.bz2
 firefox-1.0.3-source.tar.bz2
 firefox-1.0-locales.tar.bz2
+firefox-1.0.6-source.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/firefox.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- firefox.spec	25 May 2005 03:03:48 -0000	1.73
+++ firefox.spec	18 Jul 2005 22:13:14 -0000	1.74
@@ -9,8 +9,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.0.4
-Release:        4
+Version:        1.0.6
+Release:        0.1.fc4
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -72,6 +72,7 @@
 Patch104:       firefox-1.0-remote-intern-atoms.patch
 Patch105:       firefox-1.0-g-application-name.patch
 Patch106:       firefox-1.0-candidate-window.patch
+Patch107:       firefox-1.0-imgloader-comarray.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpng-devel, libjpeg-devel
@@ -145,6 +146,7 @@
 %patch104 -p0
 %patch105 -p0
 %patch106 -p1
+%patch107 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -323,6 +325,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jul 18 2005 Christopher Aillon <caillon redhat com> 0:1.0.6-0.1.fc4
+- 1.0.6 Release Candidate
+
 * Tue May 24 2005 Christopher Aillon <caillon redhat com> 0:1.0.4-4
 - Only install searchplugins for en-US, since there isn't any way
   to dynamically select searchplugins per locale yet.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 May 2005 15:52:02 -0000	1.13
+++ sources	18 Jul 2005 22:13:14 -0000	1.14
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
-0f5d0586750fde79ba98ecf3ee4425a7  firefox-1.0.4-source.tar.bz2
 2a9c2ae93baa98b96d28db380a805442  firefox-1.0-locales.tar.bz2
+7b4c1d10d478dcb4c52fbbe3e41745d9  firefox-1.0.6-source.tar.bz2