summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2008-04-15 05:40:45 +0000
committerWulf Krueger <philantrop@gentoo.org>2008-04-15 05:40:45 +0000
commit2b1bac306d4f9659b9da50b68cba81e51e7e86a6 (patch)
treefd0507246f8b381f4fd768bda2ebe75436fb8162 /kde-base/kdelibs/files
parentStable on ppc64; bug #217232 (diff)
downloadgentoo-2-2b1bac306d4f9659b9da50b68cba81e51e7e86a6.tar.gz
gentoo-2-2b1bac306d4f9659b9da50b68cba81e51e7e86a6.tar.bz2
gentoo-2-2b1bac306d4f9659b9da50b68cba81e51e7e86a6.zip
Added an upstream patch to fix bug 203433 to fix some konqueror crashes. Re-added Lubos Lunak's Xinerama patch as kindly provided by Vladimir Brik on bug 211469.
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'kde-base/kdelibs/files')
-rw-r--r--kde-base/kdelibs/files/kdelibs-3.5.9-bug_203433_khtml.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.9-bug_203433_khtml.patch b/kde-base/kdelibs/files/kdelibs-3.5.9-bug_203433_khtml.patch
new file mode 100644
index 000000000000..dcb2fc486940
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.9-bug_203433_khtml.patch
@@ -0,0 +1,25 @@
+--- trunk/KDE/kdelibs/khtml/html/html_objectimpl.cpp 2007/12/27 04:54:15 753267
++++ trunk/KDE/kdelibs/khtml/html/html_objectimpl.cpp 2007/12/27 04:54:22 753268
+@@ -243,7 +243,12 @@
+
+ _style->deref();
+ NodeBaseImpl::attach();
++
++ if (m_render) QTimer::singleShot( 0, this, SLOT( slotEmitLoadEvent() ) );
++}
+
++void HTMLObjectBaseElementImpl::slotEmitLoadEvent()
++{
+ // ### do this when we are actually finished loading instead
+ if (m_render) dispatchHTMLEvent(EventImpl::LOAD_EVENT, false, false);
+ }
+--- trunk/KDE/kdelibs/khtml/html/html_objectimpl.h 2007/12/27 04:54:15 753267
++++ trunk/KDE/kdelibs/khtml/html/html_objectimpl.h 2007/12/27 04:54:22 753268
+@@ -62,6 +62,7 @@
+ virtual void removeId(const QString& id);
+ protected Q_SLOTS:
+ void slotRenderAlternative();
++ void slotEmitLoadEvent();
+ protected:
+ DOMString m_name;
+ };