rpms/firefox/devel firefox-1.1-focus-on-navback.patch, NONE, 1.1 firefox.spec, 1.79, 1.80

[fedora-cvs-commits redhat com]

Author: caillon

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

Modified Files:
	firefox.spec 
Added Files:
	firefox-1.1-focus-on-navback.patch 
Log Message:
* Fri Jul 29 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.5.deerpark.alpha2
- Re-enable ppc now that its binutils are fixed.
- When clicking a link and going back via history, don't keep the link focused


firefox-1.1-focus-on-navback.patch:
 nsDocShell.cpp |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE firefox-1.1-focus-on-navback.patch ---
Index: docshell/base/nsDocShell.cpp
===================================================================
RCS file: /cvsroot/mozilla/docshell/base/nsDocShell.cpp,v
retrieving revision 1.695
diff -u -p -r1.695 nsDocShell.cpp
--- docshell/base/nsDocShell.cpp	3 Jul 2005 16:11:06 -0000	1.695
+++ docshell/base/nsDocShell.cpp	11 Jul 2005 21:55:30 -0000
@@ -5542,6 +5542,7 @@ nsDocShell::SetupNewViewer(nsIContentVie
     PRBool styleDisabled;
     // |newMUDV| also serves as a flag to set the data from the above vars
     nsCOMPtr<nsIMarkupDocumentViewer> newMUDV;
+    PRBool savePresentation = mSavingOldViewer;
 
     if (mContentViewer || parent) {
         nsCOMPtr<nsIMarkupDocumentViewer> oldMUDV;
@@ -5550,6 +5551,16 @@ nsDocShell::SetupNewViewer(nsIContentVie
             // XXX: it would be far better to just reuse the document viewer ,
             //      since we know we're just displaying the same document as before
             oldMUDV = do_QueryInterface(mContentViewer);
+
+            // Tell the old content viewer to hibernate in session history when
+            // it is destroyed.
+
+            if (savePresentation && NS_FAILED(CaptureState())) {
+                if (mOSHE) {
+                    mOSHE->SyncPresentationState();
+                }
+                savePresentation = PR_FALSE;
+            }
         }
         else {
             // No old content viewer, so get state from parent's content viewer
@@ -5673,17 +5684,6 @@ nsDocShell::SetupNewViewer(nsIContentVie
             }
         }
 
-        // Tell the old content viewer to hibernate in session history when
-        // it is destroyed.
-
-        PRBool savePresentation = mSavingOldViewer;
-        if (savePresentation && NS_FAILED(CaptureState())) {
-            if (mOSHE) {
-                mOSHE->SyncPresentationState();
-            }
-            savePresentation = PR_FALSE;
-        }
-
         mContentViewer->Close(savePresentation ? mOSHE.get() : nsnull);
         aNewViewer->SetPreviousViewer(mContentViewer);
 


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- firefox.spec	23 Jul 2005 06:03:00 -0000	1.79
+++ firefox.spec	29 Jul 2005 15:47:20 -0000	1.80
@@ -1,5 +1,5 @@
 # Temporary until this works again
-ExcludeArch:    ppc64 ppc
+ExcludeArch:    ppc64
 
 %define indexhtml file:///usr/share/doc/HTML/index.html
 %define desktop_file_utils_version 0.9
@@ -63,6 +63,7 @@
 
 # patches from upstream (Patch100+)
 Patch100:       firefox-1.1-modal-filechooser.patch
+Patch101:       firefox-1.1-focus-on-navback.patch
 
 
 # ---------------------------------------------------
@@ -125,6 +126,7 @@
 %patch42 -p0
 %patch80 -p1
 %patch100 -p0
+%patch101 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -258,6 +260,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Jul 29 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.5.deerpark.alpha2
+- Re-enable ppc now that its binutils are fixed.
+- When clicking a link and going back via history, don't keep the link focused
+
 * Fri Jul 22 2005 Christopher Aillon <caillon redhat com> 1.1-0.2.4.deerpark.alpha2
 - Add patch from Christian Persch to make the file chooser modal
 - Change default behavior of opening links from external apps to: New Tab