@ -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 ) |
|
@ -0,0 +1,77 @@ |
|||||
|
--- ./configure.orig 2005-03-21 12:35:09.000000000 +0100
|
||||
|
+++ ./configure 2005-03-21 12:36:27.000000000 +0100
|
||||
|
@@ -48988,7 +48988,7 @@
|
||||
|
|
||||
|
|
||||
|
|
||||
|
-for ac_header in sasl/sasl.h
|
||||
|
+for ac_header in sasl2/sasl.h
|
||||
|
do |
||||
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
||||
|
if eval "test \"\${$as_ac_Header+set}\" = set"; then |
||||
|
--- ./configure.in.orig 2005-03-21 12:35:40.000000000 +0100
|
||||
|
+++ ./configure.in 2005-03-04 14:11:05.000000000 +0100
|
||||
|
@@ -1177,7 +1177,7 @@
|
||||
|
SASL2_LIBS="" |
||||
|
|
||||
|
KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap |
||||
|
-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
||||
|
+KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
||||
|
if test "$sasl2_header" = "yes" ; then |
||||
|
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
||||
|
fi |
||||
|
--- ./kioslave/configure.in.in.orig 2004-09-30 00:30:49.000000000 +0200
|
||||
|
+++ ./kioslave/configure.in.in 2005-03-22 14:33:43.000000000 +0100
|
||||
|
@@ -4,7 +4,7 @@
|
||||
|
SASL2_LIBS="" |
||||
|
|
||||
|
KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap |
||||
|
-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
||||
|
+KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
||||
|
if test "$sasl2_header" = "yes" ; then |
||||
|
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
||||
|
fi |
||||
|
--- ./kioslave/ldap/kio_ldap.cpp.orig 2005-03-22 14:35:20.000000000 +0100
|
||||
|
+++ ./kioslave/ldap/kio_ldap.cpp 2005-03-22 14:36:19.000000000 +0100
|
||||
|
@@ -22,7 +22,7 @@
|
||||
|
#include <klocale.h> |
||||
|
|
||||
|
#ifdef HAVE_SASL_SASL_H //prefer libsasl2 |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
#else |
||||
|
#ifdef HAVE_SASL_H |
||||
|
#include <sasl.h> |
||||
|
--- ./kioslave/pop3/pop3.cc.orig 2005-03-22 12:08:08.000000000 +0100
|
||||
|
+++ ./kioslave/pop3/pop3.cc 2005-03-22 12:08:23.000000000 +0100
|
||||
|
@@ -43,7 +43,7 @@
|
||||
|
|
||||
|
#ifdef HAVE_LIBSASL2 |
||||
|
extern "C" { |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
} |
||||
|
#endif |
||||
|
|
||||
|
--- ./kioslave/smtp/command.h.orig 2005-03-22 14:35:48.000000000 +0100
|
||||
|
+++ ./kioslave/smtp/command.h 2005-03-22 14:36:33.000000000 +0100
|
||||
|
@@ -38,7 +38,7 @@
|
||||
|
|
||||
|
#ifdef HAVE_LIBSASL2 |
||||
|
extern "C" { |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
} |
||||
|
#endif |
||||
|
|
||||
|
--- ./kioslave/smtp/smtp.cc.orig 2005-03-22 14:35:56.000000000 +0100
|
||||
|
+++ ./kioslave/smtp/smtp.cc 2005-03-22 14:36:50.000000000 +0100
|
||||
|
@@ -32,7 +32,7 @@
|
||||
|
|
||||
|
#ifdef HAVE_LIBSASL2 |
||||
|
extern "C" { |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
} |
||||
|
#endif |
||||
|
|
@ -1,45 +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/kdelibs/post-3.3.2-kdelibs-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: 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 ) |
|
@ -1,46 +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/kdelibs/post-3.3.2-kdelibs-kio.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: 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") ) |
|
@ -1,36 +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/kdelibs/post-3.3.2-kdelibs-kioslave.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 --- |
|
||||
|
|
||||
--- ./kioslave/ftp/ftp.cc 21 Sep 2004 16:17:56 -0000 1.213.2.1
|
|
||||
+++ ./kioslave/ftp/ftp.cc 26 Dec 2004 00:29:54 -0000 1.213.2.2
|
|
||||
@@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
|
|
||||
{ |
|
||||
assert(m_control != NULL); // must have control connection socket |
|
||||
|
|
||||
+ if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
|
|
||||
+ {
|
|
||||
+ kdWarning(7102) << "Invalid command received (contains CR or LF): "
|
|
||||
+ << cmd.data() << endl;
|
|
||||
+ error( ERR_UNSUPPORTED_ACTION, m_host );
|
|
||||
+ return false;
|
|
||||
+ }
|
|
||||
+
|
|
||||
// Don't print out the password... |
|
||||
bool isPassCmd = (cmd.left(4).lower() == "pass"); |
|
||||
if ( !isPassCmd ) |
|
@ -0,0 +1,33 @@ |
|||||
|
--- ./kresources/kolab/kabc/resourcekolab.cpp 19 Jan 2005 15:18:12 -0000 1.17
|
||||
|
+++ ./kresources/kolab/kabc/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000
|
||||
|
@@ -80,7 +80,7 @@ KABC::ResourceKolab::ResourceKolab( cons
|
||||
|
Kolab::ResourceKolabBase( "ResourceKolab-KABC" ), |
||||
|
mCachedSubresource( QString::null ), mLocked( false ) |
||||
|
{ |
||||
|
- setType( "kolab" );
|
||||
|
+ setType( "imap" );
|
||||
|
} |
||||
|
|
||||
|
KABC::ResourceKolab::~ResourceKolab() |
||||
|
--- ./kresources/kolab/kcal/resourcekolab.cpp 22 Jan 2005 11:19:19 -0000 1.26
|
||||
|
+++ ./kresources/kolab/kcal/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000
|
||||
|
@@ -68,7 +68,7 @@ ResourceKolab::ResourceKolab( const KCon
|
||||
|
: ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ), |
||||
|
mOpen( false ) |
||||
|
{ |
||||
|
- setType( "kolab" );
|
||||
|
+ setType( "imap" );
|
||||
|
connect( &mResourceChangedTimer, SIGNAL( timeout() ), |
||||
|
this, SLOT( slotEmitResourceChanged() ) ); |
||||
|
} |
||||
|
--- ./kresources/kolab/knotes/resourcekolab.cpp 21 Feb 2005 23:33:09 -0000 1.12
|
||||
|
+++ ./kresources/kolab/knotes/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000
|
||||
|
@@ -52,7 +52,7 @@ static const char* inlineMimeType = "tex
|
||||
|
ResourceKolab::ResourceKolab( const KConfig *config ) |
||||
|
: ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ) |
||||
|
{ |
||||
|
- setType( "kolab" );
|
||||
|
+ setType( "imap" );
|
||||
|
} |
||||
|
|
||||
|
ResourceKolab::~ResourceKolab() |
@ -0,0 +1,55 @@ |
|||||
|
--- ./kioslaves/imap4/imap4.cc.orig 2005-03-22 17:30:32.000000000 +0100
|
||||
|
+++ ./kioslaves/imap4/imap4.cc 2005-03-22 17:31:55.000000000 +0100
|
||||
|
@@ -66,7 +66,7 @@
|
||||
|
|
||||
|
#ifdef HAVE_LIBSASL2 |
||||
|
extern "C" { |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
} |
||||
|
#endif |
||||
|
|
||||
|
--- ./kioslaves/imap4/imapparser.cc.orig 2005-03-22 17:30:39.000000000 +0100
|
||||
|
+++ ./kioslaves/imap4/imapparser.cc 2005-03-22 17:32:07.000000000 +0100
|
||||
|
@@ -43,7 +43,7 @@
|
||||
|
|
||||
|
#ifdef HAVE_LIBSASL2 |
||||
|
extern "C" { |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
} |
||||
|
#endif |
||||
|
|
||||
|
--- ./kioslaves/sieve/sieve.cpp.orig 2005-03-22 17:30:57.000000000 +0100
|
||||
|
+++ ./kioslaves/sieve/sieve.cpp 2005-03-22 17:32:21.000000000 +0100
|
||||
|
@@ -29,7 +29,7 @@
|
||||
|
#endif |
||||
|
|
||||
|
extern "C" { |
||||
|
-#include <sasl/sasl.h>
|
||||
|
+#include <sasl2/sasl.h>
|
||||
|
} |
||||
|
#include "sieve.h" |
||||
|
|
||||
|
--- ./kioslaves/configure.in.in.orig 2005-03-22 17:30:51.000000000 +0100
|
||||
|
+++ ./kioslaves/configure.in.in 2005-03-22 17:32:33.000000000 +0100
|
||||
|
@@ -3,7 +3,7 @@
|
||||
|
sasl2_header="no" |
||||
|
SASL2_LIBS="" |
||||
|
|
||||
|
-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
||||
|
+KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
||||
|
if test "$sasl2_header" = "yes" ; then |
||||
|
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
||||
|
fi |
||||
|
--- ./configure.in.orig 2005-03-22 17:30:24.000000000 +0100
|
||||
|
+++ ./configure.in 2005-03-22 17:31:35.000000000 +0100
|
||||
|
@@ -223,7 +223,7 @@
|
||||
|
sasl2_header="no" |
||||
|
SASL2_LIBS="" |
||||
|
|
||||
|
-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
||||
|
+KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
||||
|
if test "$sasl2_header" = "yes" ; then |
||||
|
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
||||
|
fi |