rpms/kdelibs/devel kdelibs-3.5.3-kde#130605.patch, NONE, 1.1 kdelibs.spec, 1.153, 1.154

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22236

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#130605.patch 
Log Message:
- upstream patches,
    kde#130605 - konqueror crash


kdelibs-3.5.3-kde#130605.patch:
 html_baseimpl.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#130605.patch ---
Index: khtml/html/html_baseimpl.cpp
===================================================================
--- khtml/html/html_baseimpl.cpp	(Revision 559990)
+++ khtml/html/html_baseimpl.cpp	(Revision 559991)
@@ -453,13 +453,14 @@
 {
     //### this is likely not quite right since we may be effectively "overriding" some old value,
     //which needs to be recomputed, but this is better than crashing...
-    if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
-        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
+    if (getDocument()) {
+        if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
+            getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
 
-    if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
-        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+        if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
+            getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+    }
 
-
     delete [] m_rows;
     delete [] m_cols;
 }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdelibs.spec	10 Jul 2006 09:36:50 -0000	1.153
+++ kdelibs.spec	11 Jul 2006 16:23:46 -0000	1.154
@@ -19,7 +19,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 7
+Release: 8
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -63,6 +63,7 @@
 Patch111: kdelibs-3.5.3-kde#128760.patch
 Patch112: kdelibs-3.5.3-kde#123307.patch
 Patch113: kdelibs-3.5.3-kde#106795.patch
+Patch114: kdelibs-3.5.3-kde#130605.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -206,6 +207,7 @@
 %patch111 -p0 -b .kde#128760
 %patch112 -p0 -b .kde#130252
 %patch113 -p0 -b .kde#106795
+%patch114 -p0 -b .kde#130605
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -429,6 +431,10 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
+- upstream patches,
+    kde#130605 - konqueror crash
+
 * Mon Jul 10 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
 - apply upstream patches,
     #123307 - Find previous does nothing sometimes