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.

37 lines
1.5 KiB

  1. diff -rduN kdelibs-old/kdecore/kapplication.cpp kdelibs-new/kdecore/kapplication.cpp
  2. --- kdelibs-old/kdecore/kapplication.cpp 2004-04-04 11:08:10.000000000 +0200
  3. +++ kdelibs-new/kdecore/kapplication.cpp 2004-05-18 16:54:14.000000000 +0200
  4. @@ -2165,7 +2165,7 @@
  5. if (command.isEmpty() || command == QString::fromLatin1("kmail")
  6. || command.endsWith("/kmail"))
  7. - command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
  8. + command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
  9. // TODO: Take care of the preferred terminal app (instead of hardcoding
  10. // Konsole), this will probably require a rewrite of the configurable
  11. diff -rduN kdelibs-old/kio/misc/ktelnetservice.cpp kdelibs-new/kio/misc/ktelnetservice.cpp
  12. --- kdelibs-old/kio/misc/ktelnetservice.cpp 2004-02-28 10:50:23.000000000 +0100
  13. +++ kdelibs-new/kio/misc/ktelnetservice.cpp 2004-05-18 17:06:26.000000000 +0200
  14. @@ -77,10 +77,19 @@
  15. cmd << url.user();
  16. }
  17. + QString host;
  18. if (!url.host().isEmpty())
  19. - cmd << url.host(); // telnet://host
  20. + host = url.host(); // telnet://host
  21. else if (!url.path().isEmpty())
  22. - cmd << url.path(); // telnet:host
  23. + host = url.path(); // telnet:host
  24. +
  25. + if (host.isEmpty() || host.startsWith("-"))
  26. + {
  27. + kdError() << "Invalid hostname " << host << endl;
  28. + return 2;
  29. + }
  30. +
  31. + cmd << host;
  32. if (url.port()){
  33. if ( url.protocol() == "ssh" )