[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/cups
From:       Alex Kern <alex.kern () gmx ! de>
Date:       2006-04-25 13:03:13
Message-ID: 1145970193.872058.20644.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 533674 by kernalex:

replace UNIX domain socket address in generic IPP request with "localhost". Backport \
tested on kde3, i386 and CUPS 1.2rc3. kde4 compile tested.

 M  +10 -0     cupsinfos.cpp  
 M  +1 -0      cupsinfos.h  
 M  +1 -1      kmcupsjobmanager.cpp  
 M  +2 -2      kmcupsmanager.cpp  
 M  +1 -1      kmcupsuimanager.cpp  
 M  +1 -1      kmwfax.cpp  


--- trunk/KDE/kdelibs/kdeprint/cups/cupsinfos.cpp #533673:533674
@@ -168,3 +168,13 @@
 		return QString("%1")
 			.arg(host_);
 }
+
+const QString CupsInfos::ippaddr() const
+{
+	if(host_[0] != '/')
+		return QString("%1:%2")
+			.arg(host_)
+			.arg(port_);
+	else
+		return QString("localhost");
+}
--- trunk/KDE/kdelibs/kdeprint/cups/cupsinfos.h #533673:533674
@@ -34,6 +34,7 @@
 	const QString& host() const;
 	int port() const;
 	const QString hostaddr() const;
+	const QString ippaddr() const;
 	const QString& login() const;
 	const QString& password() const;
 	const QString& realLogin() const;
--- trunk/KDE/kdelibs/kdeprint/cups/kmcupsjobmanager.cpp #533673:533674
@@ -94,7 +94,7 @@
 				if (argstr.isEmpty()) return false;
 				req.setOperation(CUPS_MOVE_JOB);
 				uri = QString::fromLatin1("ipp://%1/printers/%2")
-					.arg(CupsInfos::self()->hostaddr())
+					.arg(CupsInfos::self()->ippaddr())
 					.arg(argstr);
 				req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri);
 				break;
--- trunk/KDE/kdelibs/kdeprint/cups/kmcupsmanager.cpp #533673:533674
@@ -136,7 +136,7 @@
 	{
 		req.setOperation(CUPS_ADD_CLASS);
 		QStringList	members = p->members(), uris;
-		QString		s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 +		QString		s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->ippaddr());
  for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
 			uris.append(s+(*it));
 		req.addURI(IPP_TAG_PRINTER,"member-uris",uris);
@@ -974,7 +974,7 @@
 		uri = p->uri().prettyURL();
 	else
 		uri = QString("ipp://%1/%3/%2")
-			.arg(CupsInfos::self()->hostaddr())
+			.arg(CupsInfos::self()->ippaddr())
 			.arg(p->printerName())
 			.arg((p->isClass(false) ? "classes" : "printers"));
 	return uri;
--- trunk/KDE/kdelibs/kdeprint/cups/kmcupsuimanager.cpp #533673:533674
@@ -148,7 +148,7 @@
 	QString		uri;
 
 	req.setOperation(CUPS_GET_DEVICES);
-	uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 +	uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->ippaddr());
  req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 
 	if (req.doRequest("/"))
--- trunk/KDE/kdelibs/kdeprint/cups/kmwfax.cpp #533673:533674
@@ -50,7 +50,7 @@
 	// initialize
 	IppRequest	req;
 	req.setOperation(CUPS_GET_DEVICES);
-	QString	uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 +	QString	uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->ippaddr());
  req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 	if (req.doRequest("/"))
 	{


[prev in list] [next in list] [prev in thread] [next in thread]