You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
2.5 KiB
46 lines
2.5 KiB
# --- 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") )
|