[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    [Kde-pim] [PATCH] Akregator mem leak fix
From:       Frank Osterfeld <frank.osterfeld () gmx ! de>
Date:       2005-02-27 19:47:27
Message-ID: 200502272047.28048.frank.osterfeld () gmx ! de
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


Hi,

I'd like to commit the attached patch to the 3.4 branch.

It fixes the bug that the internal browser part's khtmlview is left undeleted 
when the part is destroyed (i.e. a tab is closed). It also fixes the problem 
with multiple "cockroach icons" (khtml parsing errors), which remained in the 
statusbar even when the browser tab was closed.

Regards,

Frank

["akregator-htmlwidget-cleanup.diff" (text/x-diff)]

Index: akregator_view.cpp
===================================================================
RCS file: /home/kde/kdepim/akregator/src/akregator_view.cpp,v
retrieving revision 1.225
diff -u -p -r1.225 akregator_view.cpp
--- akregator_view.cpp	20 Feb 2005 19:33:24 -0000	1.225
+++ akregator_view.cpp	27 Feb 2005 19:20:05 -0000
@@ -612,8 +612,8 @@ void View::slotRemoveFrame()
         return;
 
     if (f->part() != m_part)
-        delete f->part();
-        
+        f->part()->deleteLater();
+
     m_tabs->removeFrame(f);
     
     if (m_tabs->count() <= 1)
Index: pageviewer.cpp
===================================================================
RCS file: /home/kde/kdepim/akregator/src/pageviewer.cpp,v
retrieving revision 1.33
diff -u -p -r1.33 pageviewer.cpp
--- pageviewer.cpp	31 Jan 2005 19:14:47 -0000	1.33
+++ pageviewer.cpp	27 Feb 2005 19:20:05 -0000
@@ -87,6 +87,11 @@ PageViewer::PageViewer(QWidget *parent, 
     m_restoring = false;
     // uncomment this to load konq plugins (doesn't work properly and clutters the GUI)
     //loadPlugins( partObject(), this, instance() );
+    
+}
+
+PageViewer::~PageViewer()
+{
 }
 
 // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
Index: pageviewer.h
===================================================================
RCS file: /home/kde/kdepim/akregator/src/pageviewer.h,v
retrieving revision 1.21
diff -u -p -r1.21 pageviewer.h
--- pageviewer.h	30 Jan 2005 19:54:54 -0000	1.21
+++ pageviewer.h	27 Feb 2005 19:20:05 -0000
@@ -44,7 +44,7 @@ namespace Akregator
         Q_OBJECT
         public:
             PageViewer(QWidget* parent, const char* name);
-            
+            virtual ~PageViewer();
             virtual bool openURL(const KURL &url);
 
         public slots:
Index: viewer.cpp
===================================================================
RCS file: /home/kde/kdepim/akregator/src/viewer.cpp,v
retrieving revision 1.40
diff -u -p -r1.40 viewer.cpp
--- viewer.cpp	2 Feb 2005 10:01:31 -0000	1.40
+++ viewer.cpp	27 Feb 2005 19:20:05 -0000
@@ -67,6 +67,9 @@ SIGNAL(popupMenu (KXMLGUIClient*, const 
                                  actionCollection(), "copylinkaddress");
 }
 
+Viewer::~Viewer()
+{}
+
 bool Viewer::openURL(const KURL &url)
 {
     new Akregator::BrowserRun(this, (QWidget*)parent(), this, url, KParts::URLArgs());
Index: viewer.h
===================================================================
RCS file: /home/kde/kdepim/akregator/src/viewer.h,v
retrieving revision 1.23
diff -u -p -r1.23 viewer.h
--- viewer.h	2 Feb 2005 10:01:31 -0000	1.23
+++ viewer.h	27 Feb 2005 19:20:05 -0000
@@ -24,6 +24,8 @@ namespace Akregator
         Q_OBJECT
         public:
             Viewer(QWidget* parent, const char* name);
+            virtual ~Viewer();
+
             virtual bool closeURL();
             virtual bool openURL(const KURL &);
             

[Attachment #8 (application/pgp-signature)]

_______________________________________________
kde-pim mailing list
kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

[prev in list] [next in list] [prev in thread] [next in thread]