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.

38 lines
1.1 KiB

  1. This is a hotfix for KDE 3.5.5 with CUPS 1.2.x.
  2. Copied from http://bugs.kde.org/show_bug.cgi?id=115891:
  3. Empty printer list fix patch 2006-11-01 18:06:33
  4. --- kde.orig/kdeprint/cups/ipprequest.cpp
  5. +++ kde.patched/kdeprint/cups/ipprequest.cpp
  6. @@ -329,6 +329,10 @@
  7. dumpRequest(request_, true);
  8. }
  9. + /* No printers found */
  10. + if ( request_ && request_->request.status.status_code == 0x406 )
  11. + return true;
  12. +
  13. if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00))
  14. return false;
  15. --- kde.orig/kdeprint/cups/kmcupsmanager.cpp
  16. +++ kde.patched/kdeprint/cups/kmcupsmanager.cpp
  17. @@ -61,7 +61,7 @@
  18. #define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8())
  19. void extractMaticData(QString& buf, const QString& filename);
  20. -QString printerURI(KMPrinter *p, bool useExistingURI = false);
  21. +QString printerURI(KMPrinter *p, bool useExistingURI);
  22. QString downloadDriver(KMPrinter *p);
  23. static int trials = 5;
  24. @@ -218,7 +218,7 @@
  25. QString uri;
  26. req.setOperation(state);
  27. - uri = printerURI(p);
  28. + uri = printerURI(p, true);
  29. req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
  30. if (req.doRequest("/admin/"))
  31. return true;