rpms/kdeadmin/F-11 kdeadmin-4.2.2-printing.patch,1.3,1.4

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29944

Modified Files:
	kdeadmin-4.2.2-printing.patch 
Log Message:
fix a bug that causes  python2.5 crashed with TypeError


kdeadmin-4.2.2-printing.patch:

Index: kdeadmin-4.2.2-printing.patch
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin-4.2.2-printing.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdeadmin-4.2.2-printing.patch	21 Apr 2009 13:08:12 -0000	1.3
+++ kdeadmin-4.2.2-printing.patch	21 Apr 2009 13:36:20 -0000	1.4
@@ -202,7 +202,7 @@
 +                urllib.unquote (user), urllib.unquote (password))
 diff -up kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py
 --- kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py.printing	2008-12-21 21:20:45.000000000 +0100
-+++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 14:52:29.000000000 +0200
++++ kdeadmin-4.2.2/system-config-printer-kde/system-config-printer-kde.py	2009-04-21 15:29:16.000000000 +0200
 @@ -33,7 +33,7 @@ import sys, os, time, traceback, re, tem
  import thread
  
@@ -220,7 +220,17 @@
  import cupshelpers  #, options
  from smburi import SMBURI
  from debug import *
-@@ -1480,9 +1479,8 @@ class NewPrinterGUI(QDialog):
+@@ -717,8 +716,7 @@ class GUI(QWidget):
+                 job_id = self.cups.printTestPage(self.printer.name)
+ 
+             self.setTestButton (self.printer)
+-            QMessageBox.information(self, i18nc("Test page submitted", "Submitted"), i18n("Test page submitted as "
+-                                                            "job %d") % job_id)
++            KMessageBox.information(self, i18n("Test page submitted as job %1", job_id), i18nc("Test page submitted", "Submitted"))
+         except cups.IPPError, (e, msg):
+             if (e == cups.IPP_NOT_AUTHORIZED and
+                 self.connect_server != 'localhost' and
+@@ -1480,9 +1478,8 @@ class NewPrinterGUI(QDialog):
          """
  
          # Optionally disable downloadable driver support.