diff options
Diffstat (limited to 'x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2')
-rw-r--r-- | x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 new file mode 100644 index 000000000000..f31b6341cf9c --- /dev/null +++ b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 @@ -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 ) |