rpms/kdebase/F-9 kdebase-4.0.4-konqueror-updatehistoryentry.patch, NONE, 1.1 kdebase.spec, 1.321, 1.322

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10262

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.0.4-konqueror-updatehistoryentry.patch 
Log Message:
backport konqueror crash fix from trunk


kdebase-4.0.4-konqueror-updatehistoryentry.patch:

--- NEW FILE kdebase-4.0.4-konqueror-updatehistoryentry.patch ---
diff -up kdebase-4.0.4/apps/konqueror/src/konqview.cpp.orig kdebase-4.0.4/apps/konqueror/src/konqview.cpp
--- kdebase-4.0.4/apps/konqueror/src/konqview.cpp.orig	2008-05-24 22:45:17.000000000 +0200
+++ kdebase-4.0.4/apps/konqueror/src/konqview.cpp	2008-05-24 22:48:49.000000000 +0200
@@ -1380,7 +1380,7 @@ void KonqView::saveConfig( KConfigGroup&
     if (options & KonqFrameBase::saveURLs) {
         config.writePathEntry( QString::fromLatin1( "URL" ).prepend( prefix ), url().url() );
     } else if(options & KonqFrameBase::saveHistoryItems) {
-        if (m_pPart)
+        if (m_pPart && !m_bLockHistory)
             updateHistoryEntry(true);
         QList<HistoryEntry*>::Iterator it = m_lstHistory.begin();
         for ( uint i = 0; it != m_lstHistory.end(); ++it, ++i ) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- kdebase.spec	11 May 2008 09:13:51 -0000	1.321
+++ kdebase.spec	24 May 2008 20:55:15 -0000	1.322
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -32,6 +32,8 @@
 Patch100: kdebase-4.0.3-kde#160422.patch
 # http://bugzilla.redhat.com/438786 (will upstream -- Rex)
 Patch102: kdebase-4.0.3-kwrite-dt_categories.patch
+# backporte from 4.1
+Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -124,8 +126,8 @@
 %setup -q -n kdebase-%{version}
 
 %patch100 -p0 -b .kde#160422
-%patch102 -p1 -b kwrite-dt_categories
-
+%patch102 -p1 -b .kwrite-dt_categories
+%patch103 -p1 -b .konqueror-updatehistoryentry
 
 %build
 
@@ -304,6 +306,9 @@
 
 
 %changelog
+* Sat May 24 2008 Than Ngo <than at redhat.com> 4.0.4-3
+- backport konqueror crash fix from trunk
+
 * Sun May 11 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.4-2
 - quote semicolon in fix for #442834
 - only do the echo when konquerorsu.desktop is actually shipped (#445989)