diff options
Diffstat (limited to 'x11/kdelibs4/files')
-rw-r--r-- | x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2 | 26 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff | 21 |
2 files changed, 47 insertions, 0 deletions
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2 b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2 new file mode 100644 index 000000000000..0ff5af8fe26b --- /dev/null +++ b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2 @@ -0,0 +1,26 @@ +Index: khtml_part.cpp +=================================================================== +RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v +retrieving revision 1.1015.2.12 +diff -u -p -r1.1015.2.12 khtml_part.cpp +--- khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12 ++++ khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000 +@@ -4758,7 +4758,7 @@ KHTMLPart * + KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) + { + #ifdef DEBUG_FINDFRAME +- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; ++ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; + #endif + // Check access + KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart); +@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read + if (!checkFrameAccess(callingHtmlPart)) + return 0; + ++ if (!childFrame && !parentPart() && (name() == f)) ++ return this; ++ + FrameIt it = d->m_frames.find( f ); + const FrameIt end = d->m_frames.end(); + if ( it != end ) diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff new file mode 100644 index 000000000000..674ba009495b --- /dev/null +++ b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff @@ -0,0 +1,21 @@ +--- kio/kio/job.cpp 9 Nov 2004 00:50:35 -0000 1.397.2.5 ++++ kio/kio/job.cpp 8 Dec 2004 01:08:15 -0000 1.397.2.8 +@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile() + if ( f.open( IO_ReadWrite ) ) + { + f.close(); + KSimpleConfig config( path ); + config.setDesktopGroup(); +- config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() ); +- KURL urlName = (*it).uSource; +- urlName.setPass( "" ); +- config.writeEntry( QString::fromLatin1("Name"), urlName.url() ); ++ KURL url = (*it).uSource; ++ url.setPass( "" ); ++ config.writePathEntry( QString::fromLatin1("URL"), url.url() ); ++ config.writeEntry( QString::fromLatin1("Name"), url.url() ); + config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") ); + QString protocol = (*it).uSource.protocol(); + if ( protocol == QString::fromLatin1("ftp") ) + config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") ); + else if ( protocol == QString::fromLatin1("http") ) |