File cups-only-accepts-localhost-ipp.diff of Package kdelibs3

Overview Repositories Revisions Requests Users Attributes Meta

File cups-only-accepts-localhost-ipp.diff of Package kdelibs3 (Revision f985b797147081e5e58b3111a1ab6c84)

Currently displaying revision f985b797147081e5e58b3111a1ab6c84 , Show latest

--- kdeprint/cups/kmwfax.cpp
+++ kdeprint/cups/kmwfax.cpp
@@ -48,7 +48,7 @@
 	// initialize
 	IppRequest	req;
 	req.setOperation(CUPS_GET_DEVICES);
-	QString	uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
+	QString	uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 	if (req.doRequest("/"))
 	{
--- kdeprint/cups/cupsinfos.cpp
+++ kdeprint/cups/cupsinfos.cpp
@@ -73,7 +73,7 @@
 {
     if (host_[0] != '/')
         return host_ + ":" + QString::number(port_);
-    return host_;
+    return "localhost";
 }
 
 void CupsInfos::setHost(const QString& s)
--- kdeprint/cups/kmcupsjobmanager.cpp
+++ kdeprint/cups/kmcupsjobmanager.cpp
@@ -92,7 +92,9 @@
 			case KMJob::Move:
 				if (argstr.isEmpty()) return false;
 				req.setOperation(CUPS_MOVE_JOB);
-				uri = QString::fromLatin1("ipp://%1:%2/printers/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(argstr);
+				uri =
+				    QString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(),
+					    argstr);
 				req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri);
 				break;
 			default:
@@ -109,7 +111,6 @@
 bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit)
 {
 	IppRequest	req;
-	QString		uri("ipp://%1:%2/%3/%4");
 	QStringList	keys;
 	CupsInfos	*infos = CupsInfos::self();
 
@@ -143,7 +144,8 @@
 		*/
 	}
 	else
-		req.addURI(IPP_TAG_OPERATION, "printer-uri", uri.arg(infos->host()).arg(infos->port()).arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname));
+		req.addURI(IPP_TAG_OPERATION, "printer-uri", QString("ipp://%1/%2/%3").arg(infos->hostaddr(),
+                            (mp&&mp->isClass())?"classes":"printers", prname));
 
 	// other attributes
 	req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys);
--- kdeprint/cups/kmwippselect.cpp
+++ kdeprint/cups/kmwippselect.cpp
@@ -75,7 +75,7 @@
 	IppRequest	req;
 	QString		uri;
 	req.setOperation(CUPS_GET_PRINTERS);
-	uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(url.host()).arg(url.port());
+	uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 	req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name"));
 	if (req.doRequest("/printers/"))
--- kdeprint/cups/kmcupsmanager.cpp
+++ kdeprint/cups/kmcupsmanager.cpp
@@ -60,9 +60,9 @@
 
 #define ppdi18n(s)	i18n(QString::fromLocal8Bit(s).utf8())
 
-void extractMaticData(QString& buf, const QString& filename);
-QString printerURI(KMPrinter *p, bool useExistingURI = false);
-QString downloadDriver(KMPrinter *p);
+static void extractMaticData(QString& buf, const QString& filename);
+static QString printerURI(KMPrinter *p, bool useExistingURI = false);
+static QString downloadDriver(KMPrinter *p);
 
 static int trials = 5;
 
@@ -912,7 +912,9 @@
 {
 	return QString("%1: %2")
 		.arg(i18n("Server"))
-		.arg(CupsInfos::self()->hostaddr());
+		.arg(CupsInfos::self()->host()[0] != '/' ?
+			QString("%1:%2").arg(CupsInfos::self()->host(), CupsInfos::self()->port())
+			: CupsInfos::self()->host());
 }
 
 void KMCupsManager::checkUpdatePossibleInternal()
@@ -1012,7 +1014,7 @@
 
 //*****************************************************************************************************
 
-void extractMaticData(QString& buf, const QString& filename)
+static void extractMaticData(QString& buf, const QString& filename)
 {
 	QFile	f(filename);
 	if (f.exists() && f.open(IO_ReadOnly))
@@ -1028,7 +1030,7 @@
 	}
 }
 
-QString printerURI(KMPrinter *p, bool use)
+static QString printerURI(KMPrinter *p, bool use)
 {
 	QString	uri;
 	if (use && !p->uri().isEmpty())
@@ -1038,7 +1040,7 @@
 	return uri;
 }
 
-QString downloadDriver(KMPrinter *p)
+static QString downloadDriver(KMPrinter *p)
 {
 	QString	driverfile, prname = p->printerName();
 	bool	changed(false);

Places

File cups-only-accepts-localhost-ipp.diff of Package kdelibs3 (Revision f985b797147081e5e58b3111a1ab6c84)

Places