rpms/system-config-printer/devel system-config-printer-0.7.x.patch, NONE, 1.1 system-config-printer.spec, 1.148, 1.149

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17925

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-0.7.x.patch 
Log Message:
* Tue Nov 27 2007 Tim Waugh <twaugh at redhat.com>
- pycups: Applied patch from SVN to allow fetching printer attributes by URI.


system-config-printer-0.7.x.patch:

--- NEW FILE system-config-printer-0.7.x.patch ---
diff -up system-config-printer-0.7.78/print-applet.desktop.in.0.7.x system-config-printer-0.7.78/print-applet.desktop.in
--- system-config-printer-0.7.78/print-applet.desktop.in.0.7.x	2007-11-22 15:23:59.000000000 +0000
+++ system-config-printer-0.7.78/print-applet.desktop.in	2007-11-27 12:51:17.000000000 +0000
@@ -5,6 +5,6 @@ _Comment=System tray icon for managing p
 Exec=/usr/bin/system-config-printer-applet
 Terminal=false
 Type=Application
-Icon=printer.png
+Icon=printer
 X-KDE-autostart-after=panel
 StartupNotify=false
diff -up system-config-printer-0.7.78/system-config-printer.py.0.7.x system-config-printer-0.7.78/system-config-printer.py
--- system-config-printer-0.7.78/system-config-printer.py.0.7.x	2007-11-22 15:23:59.000000000 +0000
+++ system-config-printer-0.7.78/system-config-printer.py	2007-11-27 12:51:17.000000000 +0000
@@ -3231,10 +3231,16 @@ class NewPrinterGUI(GtkGUI):
             try:
                 cups.setServer (match.group (2))
                 c = cups.Connection ()
-                attributes = c.getPrinterAttributes (match.group (4))
+                try:
+                    attributes = c.getPrinterAttributes (uri = uri)
+                except TypeError: # uri keyword introduced in pycups 1.9.32
+                    print "Fetching printer attributes by name"
+                    attributes = c.getPrinterAttributes (match.group (4))
                 verified = True
+            except cups.IPPError (e, msg):
+                print "Failed to get attributes:", e, msg
             except:
-                pass
+                nonfatalError ()
         else:
             print uri
 
@@ -3279,9 +3285,8 @@ class NewPrinterGUI(GtkGUI):
             printers = c.getPrinters ()
             classes = c.getClasses ()
             del c
-        except RuntimeError:
-            failed = True
-        except cups.IPP_Error, (e, msg):
+        except:
+            nonfatalException()
             failed = True
 
         gtk.gdk.threads_enter()
diff -U0 system-config-printer-0.7.78/ChangeLog.0.7.x system-config-printer-0.7.78/ChangeLog
--- system-config-printer-0.7.78/ChangeLog.0.7.x	2007-11-22 15:23:59.000000000 +0000
+++ system-config-printer-0.7.78/ChangeLog	2007-11-27 12:51:17.000000000 +0000
@@ -0,0 +1,14 @@
+2007-11-27  Tim Waugh  <twaugh at redhat.com>
+
+	* system-config-printer.py
+	(NewPrinterGUI.browse_ipp_queues_thread): Handle exceptions other
+	than RuntimeError and cups.IPPError (bug #252304).
+	(NewPrinterGUI.on_btnIPPVerify_clicked): Get printer attributes by
+	printer URI not name, to prevent pycups constructing a CUPS URI
+	(bug #252304).
+
+2007-11-22  Till Kamppeter  <till.kamppeter at gmail.com>
+
+	* print-applet.desktop.in: Removed the last printer.png (Ubuntu package
+	did not build with Icon=printer.png in the .desktop file).
+


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- system-config-printer.spec	27 Nov 2007 12:50:08 -0000	1.148
+++ system-config-printer.spec	27 Nov 2007 12:53:03 -0000	1.149
@@ -13,6 +13,7 @@
 Source3: system-config-printer.console
 Patch0: pycups-job-sheets.patch
 Patch1: pycups-attributes-uri.patch
+Patch100: system-config-printer-0.7.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -59,6 +60,8 @@
 %patch1 -p1 -b .attributes-uri
 popd
 
+%patch100 -p1 -b .0.7.x
+
 %build
 %configure
 
@@ -130,6 +133,7 @@
 %changelog
 * Tue Nov 27 2007 Tim Waugh <twaugh at redhat.com>
 - pycups: Applied patch from SVN to allow fetching printer attributes by URI.
+- Sync to SVN 1748.
 
 * Thu Nov 22 2007 Tim Waugh <twaugh at redhat.com> 0.7.78-1
 - pycups: Fix job-sheets-default attribute.