rpms/system-config-printer/F-11 system-config-printer-network-model.patch, NONE, 1.1 system-config-printer.spec, 1.292, 1.293

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16240

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-network-model.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Determine make/model for network printers (bug #524321).


system-config-printer-network-model.patch:
 system-config-printer.py |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE system-config-printer-network-model.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.network-model system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.network-model	2009-09-30 16:55:46.115760592 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:55:52.545635754 +0100
@@ -4217,6 +4217,12 @@ class NewPrinterGUI(GtkGUI):
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
                     return
+
+                if not devid and self.device.type in ["socket", "lpd", "ipp"]:
+                    # This is a network printer whose model we don't yet know.
+                    # Try to discover it.
+                    self.getNetworkPrinterMakeModel ()
+
                 uri = self.device.uri
                 if uri and uri.startswith ("smb://"):
                     uri = SMBURI (uri=uri[6:]).sanitize_uri ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- system-config-printer.spec	30 Sep 2009 15:55:38 -0000	1.292
+++ system-config-printer.spec	30 Sep 2009 15:57:07 -0000	1.293
@@ -22,6 +22,7 @@ Patch6: system-config-printer-missing-im
 Patch7: system-config-printer-find-return-accel.patch
 Patch8: system-config-printer-physdev-traceback.patch
 Patch9: system-config-printer-autoselect-raw.patch
+Patch10: system-config-printer-network-model.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -77,6 +78,7 @@ the configuration tool.
 %patch7 -p1 -b .find-return-accel
 %patch8 -p1 -b .physdev-traceback
 %patch9 -p1 -b .autoselect-raw
+%patch10 -p1 -b .network-model
 
 %build
 %configure
@@ -179,6 +181,7 @@ exit 0
 
 %changelog
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Determine make/model for network printers (bug #524321).
 - Auto-select the correct driver entry for raw queues.
 - Avoid traceback in PhysicalDevice.py.
 - Let Return key activate the Find button for Find Network Printer.