|
|
|
@ -1,58 +0,0 @@ |
|
|
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
|
|
# |
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
|
|
# Please add additional copyright information _after_ the line containing |
|
|
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
|
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
|
|
# |
|
|
|
# ROCK Linux: rock-src/package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch |
|
|
|
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|
|
|
# |
|
|
|
# This patch file is dual-licensed. It is available under the license the |
|
|
|
# patched project is licensed under, as long as it is an OpenSource license |
|
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
|
|
# of the GNU General Public License as published by the Free Software |
|
|
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
|
|
# version. |
|
|
|
# |
|
|
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
|
|
|
|
|
|
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 ) |
fake
20 years ago