rpms/kdebase/F-9 kdebase-4.0.5-konq-memleak.patch, NONE, 1.1 kdebase.spec, 1.324, 1.325

[Than Ngo (than)]

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.0.5-konq-memleak.patch 
Log Message:
backport to fix memleak


kdebase-4.0.5-konq-memleak.patch:

--- NEW FILE kdebase-4.0.5-konq-memleak.patch ---
Index: kdebase-4.0.5/apps/konqueror/src/konqview.cpp
===================================================================
--- kdebase-4.0.5/apps/konqueror/src/konqview.cpp	(Revision 817085)
+++ kdebase-4.0.5/apps/konqueror/src/konqview.cpp	(Revision 817086)
@@ -133,6 +133,9 @@
     delete m_pPart;
   }
 
+  qDeleteAll( m_lstHistory );
+  m_lstHistory.clear();
+
   setRun( 0L );
   //kDebug(1202) << "KonqView::~KonqView " << this << " done";
 }
@@ -1382,7 +1385,7 @@
     } else if(options & KonqFrameBase::saveHistoryItems) {
         if (m_pPart)
             updateHistoryEntry(true);
-        QList<HistoryEntry*>::Iterator it = m_lstHistory.begin();
+        QList<HistoryEntry*>::const_iterator it = m_lstHistory.begin();
         for ( uint i = 0; it != m_lstHistory.end(); ++it, ++i ) {
             (*it)->saveConfig(config, QString::fromLatin1( "HistoryItem" ) + QString::number(i).prepend( prefix ));
         }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- kdebase.spec	3 Jun 2008 07:52:09 -0000	1.324
+++ kdebase.spec	5 Jun 2008 11:35:32 -0000	1.325
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -34,6 +34,7 @@
 Patch102: kdebase-4.0.3-kwrite-dt_categories.patch
 # backporte from 4.1
 Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch
+Patch104: kdebase-4.0.5-konq-memleak.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -128,6 +129,7 @@
 %patch100 -p0 -b .kde#160422
 %patch102 -p1 -b .kwrite-dt_categories
 %patch103 -p1 -b .konqueror-updatehistoryentry
+%patch104 -p1 -b .konq-memleak
 
 %build
 
@@ -306,6 +308,9 @@
 
 
 %changelog
+* Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.5-3
+- backport to fix memleak
+
 * Tue Jun 03 2008 Than Ngo <than at redhat.com> -  4.0.5-2
 - respun tarball from upstream