mirror of the now-defunct rocklinux.org
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

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. Index: job.cpp
  20. ===================================================================
  21. RCS file: /home/kde/kdelibs/kio/kio/job.cpp,v
  22. retrieving revision 1.397.2.5
  23. retrieving revision 1.397.2.8
  24. diff -u -5 -d -p -r1.397.2.5 -r1.397.2.8
  25. --- ./kio/kio/job.cpp 9 Nov 2004 00:50:35 -0000 1.397.2.5
  26. +++ ./kio/kio/job.cpp 8 Dec 2004 01:08:15 -0000 1.397.2.8
  27. @@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile()
  28. if ( f.open( IO_ReadWrite ) )
  29. {
  30. f.close();
  31. KSimpleConfig config( path );
  32. config.setDesktopGroup();
  33. - config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
  34. - KURL urlName = (*it).uSource;
  35. - urlName.setPass( "" );
  36. - config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
  37. + KURL url = (*it).uSource;
  38. + url.setPass( "" );
  39. + config.writePathEntry( QString::fromLatin1("URL"), url.url() );
  40. + config.writeEntry( QString::fromLatin1("Name"), url.url() );
  41. config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
  42. QString protocol = (*it).uSource.protocol();
  43. if ( protocol == QString::fromLatin1("ftp") )
  44. config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") );
  45. else if ( protocol == QString::fromLatin1("http") )