rpms/system-config-printer/F-10 system-config-printer-autoselect-raw.patch, NONE, 1.1 system-config-printer-find-return-accel.patch, NONE, 1.1 system-config-printer-network-model.patch, NONE, 1.1 system-config-printer-physdev-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.256, 1.257

Mon Oct 12 15:42:40 UTC 2009

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-autoselect-raw.patch 
	system-config-printer-find-return-accel.patch 
	system-config-printer-network-model.patch 
	system-config-printer-physdev-traceback.patch 
Log Message:
* Mon Oct 12 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.


system-config-printer-autoselect-raw.patch:
 system-config-printer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-autoselect-raw.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.autoselect-raw system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.autoselect-raw	2009-09-30 16:54:07.363635374 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:54:19.189761633 +0100
@@ -3948,8 +3948,8 @@ class NewPrinterGUI(GtkGUI):
                  cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
             else:
                 # Special CUPS names for a raw queue.
-                self.auto_make = 'Raw'
-                self.auto_model = 'Queue'
+                self.auto_make = 'Generic'
+                self.auto_model = 'Raw Queue'
 
             try:
                 if self.dialog_mode == "ppd":

system-config-printer-find-return-accel.patch:
 NewPrinterWindow.glade |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-find-return-accel.patch ---
diff -up system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel system-config-printer-1.1.13/glade/NewPrinterWindow.glade
--- system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/glade/NewPrinterWindow.glade	2009-09-30 16:50:36.981760810 +0100
@@ -2580,6 +2580,7 @@ DTR/DSR (Hardware)</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
 						  <signal name="clicked" handler="on_btnNetworkFind_clicked" last_modification_time="Fri, 19 Dec 2008 16:04:53 GMT"/>
+						  <accelerator key="Return" modifiers="0" signal="activate"/>
 						</widget>
 						<packing>
 						  <property name="left_attach">2</property>

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 ()

system-config-printer-physdev-traceback.patch:
 PhysicalDevice.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-physdev-traceback.patch ---
diff -up system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback system-config-printer-1.1.13/PhysicalDevice.py
--- system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/PhysicalDevice.py	2009-09-30 16:52:24.486760364 +0100
@@ -48,6 +48,8 @@ class PhysicalDevice:
                     hostport = ipparam[3:]
                 else:
                     return None
+            else:
+                return None
         else:
             (hostport, rest) = urllib.splithost (rest)
             if hostport == None:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- system-config-printer.spec	22 Sep 2009 10:18:07 -0000	1.256
+++ system-config-printer.spec	12 Oct 2009 15:42:39 -0000	1.257
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,10 @@ Patch1: system-config-printer-data-butto
 Patch2: system-config-printer-cancel-traceback.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
+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
@@ -71,6 +75,10 @@ the configuration tool.
 %patch2 -p1 -b .cancel-traceback
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
+%patch7 -p1 -b .find-return-accel
+%patch8 -p1 -b .physdev-traceback
+%patch9 -p1 -b .autoselect-raw
+%patch10 -p1 -b .network-model
 
 %build
 %configure
@@ -172,6 +180,12 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Oct 12 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.
+
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
 - Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.


