X-Git-Url: https://git.saurik.com/apple/mdnsresponder.git/blobdiff_plain/7f0064bd55e3fa98568d2c359429ff8a38b23a6c..f5e6e86cb0d7e0c7608c30d93ecb200173f29055:/Clients/PrinterSetupWizard/FourthPage.cpp

diff --git a/Clients/PrinterSetupWizard/FourthPage.cpp b/Clients/PrinterSetupWizard/FourthPage.cpp
index c4ccc52..a2a7a50 100644
--- a/Clients/PrinterSetupWizard/FourthPage.cpp
+++ b/Clients/PrinterSetupWizard/FourthPage.cpp
@@ -23,6 +23,12 @@
     Change History (most recent first):
     
 $Log: FourthPage.cpp,v $
+Revision 1.6  2005/02/08 21:45:06  shersche
+<rdar://problem/3947490> Default to Generic PostScript or PCL if unable to match driver
+
+Revision 1.5  2005/01/06 08:17:08  shersche
+Display the selected protocol ("Raw", "LPR", "IPP") rather than the port name
+
 Revision 1.4  2004/07/13 20:15:04  shersche
 <rdar://problem/3726363> Load large font name from resource
 Bug #: 3726363
@@ -77,7 +83,7 @@ void CFourthPage::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_PRINTER_NAME, m_printerNameCtrl);
 	DDX_Control(pDX, IDC_PRINTER_MANUFACTURER, m_printerManufacturerCtrl);
 	DDX_Control(pDX, IDC_PRINTER_MODEL, m_printerModelCtrl);
-	DDX_Control(pDX, IDC_PRINTER_PORT, m_printerPortCtrl);
+	DDX_Control(pDX, IDC_PRINTER_PROTOCOL, m_printerProtocolCtrl);
 	DDX_Control(pDX, IDC_PRINTER_DEFAULT, m_printerDefault);
 }
 
@@ -123,8 +129,11 @@ CFourthPage::OnSetActive()
 
 	m_printerNameCtrl.SetWindowText( printer->actualName );
 	m_printerManufacturerCtrl.SetWindowText ( printer->manufacturer );
-	m_printerModelCtrl.SetWindowText ( printer->model );
-	m_printerPortCtrl.SetWindowText ( printer->portName );
+	m_printerModelCtrl.SetWindowText ( printer->displayModelName );
+
+	Service * service = printer->services.front();
+	require_quiet( service, exit );
+	m_printerProtocolCtrl.SetWindowText ( service->protocol );
 
 	if (printer->deflt)
 	{