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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kdeprint/cups
From:       Cristian Tibirna <tibirna () kde ! org>
Date:       2005-11-14 3:21:21
Message-ID: 1131938481.316509.11981.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 480261 by tibirna:

patch from Patrick Gosling (jpmg eng cam ac uk) for selecting the
PPD of first printer in a class.
BUG:112536


 M  +18 -1     kmcupsmanager.cpp  


--- branches/KDE/3.5/kdelibs/kdeprint/cups/kmcupsmanager.cpp #480260:480261
@@ -524,9 +524,26 @@
 
 DrMain* KMCupsManager::loadPrinterDriver(KMPrinter *p, bool)
 {
-	if (!p || p->isClass(true))
+	if (!p) 
 		return NULL;
 
+	if (p->isClass(true)) 
+	{
+		KMPrinter *first_class_member = NULL;
+		/* find the first printer in the class */
+ 		first_class_member = findPrinter(p->members().first());
+	  
+		if (first_class_member == NULL) 
+		{
+			/* we didn't find a printer in the class */
+			return NULL;
+		}
+		else
+		{
+			p = first_class_member;
+		}
+	}
+
 	QString	fname = downloadDriver(p);
 	DrMain	*driver(0);
 	if (!fname.isEmpty())
[prev in list] [next in list] [prev in thread] [next in thread]