Browse Source

fake:


			
			
				rocklinux
			
			
		
fake 20 years ago
parent
commit
e762babc2b
3 changed files with 92 additions and 0 deletions
  1. +39
    -0
      package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch
  2. +26
    -0
      package/kde/kdelibs/post-3.3.2-kdelibs-htmlframes2.patch
  3. +27
    -0
      package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch

+ 39
- 0
package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch

@ -0,0 +1,39 @@
Index: konq_mainwindow.cc
===================================================================
RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
retrieving revision 1.1342.2.14
diff -u -p -r1.1342.2.14 konq_mainwindow.cc
--- ./konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14
+++ ./konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000
@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
QString viewName = view->viewName();
kdDebug() << " - viewName=" << viewName << " "
<< "frame names:" << view->frameNames().join( "," ) << endl;
+
+ // First look for a hostextension containing this frame name
+ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+ if ( ext )
+ {
+ ext = ext->findFrameParent(callingPart, name);
+ kdDebug() << "BrowserHostExtension found part " << ext << endl;
+ if (!ext)
+ continue; // Don't use this window
+ }
+
if ( !viewName.isEmpty() && viewName == name )
{
kdDebug() << "found existing view by name: " << view << endl;
@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
return view;
}
- // First look for a hostextension containing this frame name
- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
- if ( ext )
- {
- ext = ext->findFrameParent(callingPart, name);
- }
-
// KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
if ( ext )

+ 26
- 0
package/kde/kdelibs/post-3.3.2-kdelibs-htmlframes2.patch

@ -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 )

+ 27
- 0
package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch

@ -0,0 +1,27 @@
Index: job.cpp
===================================================================
RCS file: /home/kde/kdelibs/kio/kio/job.cpp,v
retrieving revision 1.397.2.5
retrieving revision 1.397.2.8
diff -u -5 -d -p -r1.397.2.5 -r1.397.2.8
--- ./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") )

Loading…
Cancel
Save