r16956 - in /packages/unstable/system-config-printer/debian: changelog patches/04_jobsheets_traceback.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Sep 12 20:53:45 UTC 2008


Author: joss
Date: Fri Sep 12 20:53:45 2008
New Revision: 16956

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16956
Log:
  setPrinterJobSheets, send "none" instead. Closes: #486941, #486580.

Modified:
    packages/unstable/system-config-printer/debian/changelog
    packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch

Modified: packages/unstable/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/changelog?rev=16956&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/changelog (original)
+++ packages/unstable/system-config-printer/debian/changelog Fri Sep 12 20:53:45 2008
@@ -4,8 +4,7 @@
     + Updated Catalan translation by David Planella. Closes: #494092.
     + Updated Finnish translation by Esko Arajärvi. Closes: #498106.
   * 04_jobsheets_traceback.patch: new patch. Don't send None to 
-    setPrinterJobSheets, it only accepts strings.
-    Closes: #486941, #486580.
+    setPrinterJobSheets, send "none" instead. Closes: #486941, #486580.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 12 Sep 2008 17:50:55 +0200
 

Modified: packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch?rev=16956&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch (original)
+++ packages/unstable/system-config-printer/debian/patches/04_jobsheets_traceback.patch Fri Sep 12 20:53:45 2008
@@ -1,13 +1,13 @@
 Index: system-config-printer-1.0.0/cupshelpers.py
 ===================================================================
---- system-config-printer-1.0.0.orig/cupshelpers.py	2008-09-12 17:44:48.747750901 +0200
-+++ system-config-printer-1.0.0/cupshelpers.py	2008-09-12 17:45:13.190750223 +0200
+--- system-config-printer-1.0.0.orig/cupshelpers.py	2008-09-12 22:52:08.243530986 +0200
++++ system-config-printer-1.0.0/cupshelpers.py	2008-09-12 22:53:03.556438702 +0200
 @@ -208,6 +208,8 @@
          self.connection.setPrinterOpPolicy(self.name, policy)    
  
      def setJobSheets(self, start, end):
-+        if start == None: start = ""
-+        if end == None: end = ""
++        if not start: start = "none"
++        if not end: end = "none"
          self.connection.setPrinterJobSheets(self.name, start, end)
  
      def setAccess(self, allow, except_users):




More information about the pkg-gnome-commits mailing list