rpms/system-config-printer/devel system-config-printer-duplicate-current.patch, NONE, 1.1 clog1, 1.6, 1.7 system-config-printer.spec, 1.352, 1.353

[Tim Waugh]

Author: twaugh

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

Modified Files:
	clog1 system-config-printer.spec 
Added Files:
	system-config-printer-duplicate-current.patch 
Log Message:
* Mon Jan 25 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-3
- Only add current device to list when all devices found (bug #558524).


system-config-printer-duplicate-current.patch:
 system-config-printer.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-duplicate-current.patch ---
diff -up system-config-printer-1.1.90/system-config-printer.py.duplicate-current system-config-printer-1.1.90/system-config-printer.py
--- system-config-printer-1.1.90/system-config-printer.py.duplicate-current	2010-01-25 16:22:42.885084708 +0000
+++ system-config-printer-1.1.90/system-config-printer.py	2010-01-25 16:22:56.142210328 +0000
@@ -4757,7 +4757,7 @@ class NewPrinterGUI(GtkGUI):
         self.fetchDevices_conn = None
 
         # Add the network devices to the list.
-        self.add_devices (result, current_uri)
+        self.add_devices (result, current_uri, no_more=True)
 
     def get_hpfax_device_id(self, faxuri):
         os.environ["URI"] = faxuri
@@ -4910,16 +4910,18 @@ class NewPrinterGUI(GtkGUI):
         self.fetchDevices_conn._begin_operation (_("fetching device list"))
         self.fetchDevices (network=False, current_uri=current_uri)
 
-    def add_devices (self, devices, current_uri):
+    def add_devices (self, devices, current_uri, no_more=False):
         if current_uri:
             if devices.has_key (current_uri):
                 current = devices.pop(current_uri)
             elif devices.has_key (current_uri.replace (":9100", "")):
                 current_uri = current_uri.replace (":9100", "")
                 current = devices.pop(current_uri)
-            else:
+            elif no_more:
                 current = cupshelpers.Device (current_uri)
                 current.info = "Current device"
+            else:
+                current_uri = None
 
         devices = devices.values()
 


Index: clog1
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/clog1,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- clog1	21 Jan 2010 14:48:14 -0000	1.6
+++ clog1	25 Jan 2010 16:28:00 -0000	1.7
@@ -1,2 +1,2 @@
-* Thu Jan 21 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-2
-- Added GtkAdjustments for all XML-declared SpinButtons.
+* Mon Jan 25 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-3
+- Only add current device to list when all devices found (bug #558524).


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -p -r1.352 -r1.353
--- system-config-printer.spec	25 Jan 2010 16:02:29 -0000	1.352
+++ system-config-printer.spec	25 Jan 2010 16:28:00 -0000	1.353
@@ -20,6 +20,7 @@ Patch2: system-config-printer-copy-print
 Patch3: system-config-printer-spinbuttons.patch
 Patch4: system-config-printer-raw-statereason.patch
 Patch5: system-config-printer-async-fallback-2.patch
+Patch6: system-config-printer-duplicate-current.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,6 +85,7 @@ printers.
 %patch3 -p1 -b .spinbuttons
 %patch4 -p1 -b .raw-statereason
 %patch5 -p1 -b .async-fallback-2
+%patch6 -p1 -b .duplicate-current
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -200,6 +202,7 @@ exit 0
 
 %changelog
 * Mon Jan 25 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-3
+- Only add current device to list when all devices found (bug #558524).
 - Fixed statereason localization for raw queues (bug #558156).
 - Fixed async fallback again (bug #557854).