rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Updated patch for 1.0.x changes:

Browse Source 
- Fixed SMB authentication (bug #464003).
This commit is contained in:
Tim Waugh 2008-10-15 17:09:43 +00:00
parent ff750ba2dc
commit c787feb083
2 changed files with 111 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
system-config-printer-1.0.x.patch
View File

@ -1,6 +1,6 @@
diff -up system-config-printer-1.0.8/authconn.py.1.0.x system-config-printer-1.0.8/authconn.py
--- system-config-printer-1.0.8/authconn.py.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/authconn.py 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/authconn.py 2008-10-15 18:07:56.000000000 +0100
@@ -202,6 +202,7 @@ class Connection:
self._forbidden = False
self._auth_called = False
@ -38,12 +38,34 @@ diff -up system-config-printer-1.0.8/authconn.py.1.0.x system-config-printer-1.0
self._use_password) = d.get_auth_info ()
diff -U0 system-config-printer-1.0.8/ChangeLog.1.0.x system-config-printer-1.0.8/ChangeLog
--- system-config-printer-1.0.8/ChangeLog.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/ChangeLog 2008-10-15 11:23:12.000000000 +0100
@@ -0,0 +1,49 @@
+++ system-config-printer-1.0.8/ChangeLog 2008-10-15 18:07:56.000000000 +0100
@@ -0,0 +1,71 @@
+2008-10-15 Tim Waugh <twaugh@redhat.com>
+
+ * pysmb.py (AuthContext.perform_authentication): Don't destroy
+ authentication dialog until after we've fetched the details (bug
+ #464003).
+
+2008-10-15 Tim Waugh <twaugh@redhat.com>
+
+ * pysmb.py: Import gettext.
+
+2008-10-15 Tim Waugh <twaugh@redhat.com>
+
+ * smburi.py (SMBURI._construct): Don't construct URIs containing
+ "@/".
+
+2008-10-15 Tim Waugh <twaugh@redhat.com>
+
+ * cupshelpers/ppds.py (PPDs.getInfoFromModel): Restrict URI in
+ debugging output.
+
+2008-10-15 Tim Waugh <twaugh@redhat.com>
+
+ * pysmb.py (AuthContext.perform_authentication): Show an error
+ dialog if the password was incorrect (bug #465407).
+ * po/POTFILES.in: Translate pysmb.py (no new translatable
+ strings).
+
+2008-10-15 Tim Waugh <twaugh@redhat.com>
+
@ -89,9 +111,23 @@ diff -U0 system-config-printer-1.0.8/ChangeLog.1.0.x system-config-printer-1.0.8
+ Settings... menu entry sensitive depending on whether we are
+ connected to a server (Ubuntu #280736).
+
diff -up system-config-printer-1.0.8/cupshelpers/ppds.py.1.0.x system-config-printer-1.0.8/cupshelpers/ppds.py
--- system-config-printer-1.0.8/cupshelpers/ppds.py.1.0.x 2008-09-26 08:57:34.000000000 +0100
+++ system-config-printer-1.0.8/cupshelpers/ppds.py 2008-10-15 18:07:56.000000000 +0100
@@ -594,7 +594,9 @@ class PPDs:
_debugprint (str (ppdnamelist))
if not id_matched:
- print "No ID match for device %s:" % uri
+ sanitised_uri = re.sub (pattern="//[^@]*@/?", repl="//",
+ string=str (uri))
+ print "No ID match for device %s:" % sanitised_uri
print " <manufacturer>%s</manufacturer>" % mfg
print " <model>%s</model>" % mdl
print " <description>%s</description>" % description
diff -up system-config-printer-1.0.8/errordialogs.py.1.0.x system-config-printer-1.0.8/errordialogs.py
--- system-config-printer-1.0.8/errordialogs.py.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/errordialogs.py 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/errordialogs.py 2008-10-15 18:07:56.000000000 +0100
@@ -62,8 +62,8 @@ def show_error_dialog (title, text, pare
def show_IPP_Error(exception, message, parent=None):
@ -105,7 +141,7 @@ diff -up system-config-printer-1.0.8/errordialogs.py.1.0.x system-config-printer
text = (_("There was an error during the CUPS "
diff -up system-config-printer-1.0.8/po/el.po.1.0.x system-config-printer-1.0.8/po/el.po
--- system-config-printer-1.0.8/po/el.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/el.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/el.po 2008-10-15 18:07:56.000000000 +0100
@@ -12,14 +12,14 @@ msgid ""
msgstr ""
"Project-Id-Version: el\n"
@ -1586,7 +1622,7 @@ diff -up system-config-printer-1.0.8/po/el.po.1.0.x system-config-printer-1.0.8/
+
diff -up system-config-printer-1.0.8/po/hi.po.1.0.x system-config-printer-1.0.8/po/hi.po
--- system-config-printer-1.0.8/po/hi.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/hi.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/hi.po 2008-10-15 18:07:56.000000000 +0100
@@ -1,19 +1,19 @@
-# translation of hi.po to Hindi
-# Rajesh Ranjan <rranjan@redhat.com>, 2004, 2005, 2006.
@ -3739,7 +3775,7 @@ diff -up system-config-printer-1.0.8/po/hi.po.1.0.x system-config-printer-1.0.8/
-#~ msgstr "यह PPD CUPS के द्वारा दिया गया है."
diff -up system-config-printer-1.0.8/po/hu.po.1.0.x system-config-printer-1.0.8/po/hu.po
--- system-config-printer-1.0.8/po/hu.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/hu.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/hu.po 2008-10-15 18:07:56.000000000 +0100
@@ -4,13 +4,14 @@
# Sulyok Péter <peti@sulyok.hu>, 2004, 2008.
# Arpad Biro <biro_arpad@yahoo.com>, 2004, 2006, 2007.
@ -5991,7 +6027,7 @@ diff -up system-config-printer-1.0.8/po/hu.po.1.0.x system-config-printer-1.0.8/
+
diff -up system-config-printer-1.0.8/po/kn.po.1.0.x system-config-printer-1.0.8/po/kn.po
--- system-config-printer-1.0.8/po/kn.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/kn.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/kn.po 2008-10-15 18:07:56.000000000 +0100
@@ -1,14 +1,14 @@
-# translation of kn.po to Kannada
+# translation of system-config-printer.1.0.x.kn.po to Kannada
@ -8174,7 +8210,7 @@ diff -up system-config-printer-1.0.8/po/kn.po.1.0.x system-config-printer-1.0.8/
-#~ msgstr "PPD ಯು CUPS ನಿಂದ ಒದಗಿಸಲ್ಪಟ್ಟಿದೆ."
diff -up system-config-printer-1.0.8/po/mr.po.1.0.x system-config-printer-1.0.8/po/mr.po
--- system-config-printer-1.0.8/po/mr.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/mr.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/mr.po 2008-10-15 18:07:56.000000000 +0100
@@ -1,76 +1,72 @@
-# translation of mr.po to Marathi
+# translation of system-config-printer.1.0.x.mr.po to marathi
@ -11255,7 +11291,7 @@ diff -up system-config-printer-1.0.8/po/mr.po.1.0.x system-config-printer-1.0.8/
-#~ msgstr "हा PPD पुरवला आहे CUPS ने."
diff -up system-config-printer-1.0.8/po/nb.po.1.0.x system-config-printer-1.0.8/po/nb.po
--- system-config-printer-1.0.8/po/nb.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/nb.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/nb.po 2008-10-15 18:07:56.000000000 +0100
@@ -1,3 +1,4 @@
+# Kjartan Maraas <kmaraas@gnome.org>, 2000-2007.
# Trond Eivind Glomsrød <teg@redhat.com>, 2007.
@ -11565,9 +11601,20 @@ diff -up system-config-printer-1.0.8/po/nb.po.1.0.x system-config-printer-1.0.8/
#: ../applet.py:151
#, python-format
diff -up system-config-printer-1.0.8/po/POTFILES.in.1.0.x system-config-printer-1.0.8/po/POTFILES.in
--- system-config-printer-1.0.8/po/POTFILES.in.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/POTFILES.in 2008-10-15 18:07:56.000000000 +0100
@@ -10,6 +10,7 @@ my-default-printer.py
options.py
optionwidgets.py
probe_printer.py
+pysmb.py
system-config-printer.py
system-config-printer.glade
system-config-printer.desktop.in
diff -up system-config-printer-1.0.8/po/sk.po.1.0.x system-config-printer-1.0.8/po/sk.po
--- system-config-printer-1.0.8/po/sk.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/sk.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/sk.po 2008-10-15 18:07:56.000000000 +0100
@@ -1,86 +1,82 @@
-# Slovak translations for printconf package
-# Slovenské preklady pre balík printconf.
@ -13792,7 +13839,7 @@ diff -up system-config-printer-1.0.8/po/sk.po.1.0.x system-config-printer-1.0.8/
+
diff -up system-config-printer-1.0.8/po/sv.po.1.0.x system-config-printer-1.0.8/po/sv.po
--- system-config-printer-1.0.8/po/sv.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/sv.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/sv.po 2008-10-15 18:07:56.000000000 +0100
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: system-config-printer\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
@ -14949,7 +14996,7 @@ diff -up system-config-printer-1.0.8/po/sv.po.1.0.x system-config-printer-1.0.8/
+
diff -up system-config-printer-1.0.8/po/ta.po.1.0.x system-config-printer-1.0.8/po/ta.po
--- system-config-printer-1.0.8/po/ta.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/ta.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/ta.po 2008-10-15 18:07:56.000000000 +0100
@@ -1,4 +1,4 @@
-# translation of ta.po to Tamil
+# translation of system-config-printer.1.0.x.ta.po to Tamil
@ -17064,7 +17111,7 @@ diff -up system-config-printer-1.0.8/po/ta.po.1.0.x system-config-printer-1.0.8/
-#~ msgstr "இந்த PPD என்பது CUPSஆல் வழங்கப்பட்டதாகும்."
diff -up system-config-printer-1.0.8/po/te.po.1.0.x system-config-printer-1.0.8/po/te.po
--- system-config-printer-1.0.8/po/te.po.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/po/te.po 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/po/te.po 2008-10-15 18:07:56.000000000 +0100
@@ -2,57 +2,62 @@
# translation of te.po to
# This file is distributed under the same license as the PACKAGE package.
@ -19944,7 +19991,7 @@ diff -up system-config-printer-1.0.8/po/te.po.1.0.x system-config-printer-1.0.8/
-#~ msgstr "సిద్ధ కార్యాల ఐచ్ఛికాలను తెల్పు"
diff -up system-config-printer-1.0.8/print-applet.desktop.in.1.0.x system-config-printer-1.0.8/print-applet.desktop.in
--- system-config-printer-1.0.8/print-applet.desktop.in.1.0.x 2008-08-28 14:30:27.000000000 +0100
+++ system-config-printer-1.0.8/print-applet.desktop.in 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/print-applet.desktop.in 2008-10-15 18:07:56.000000000 +0100
@@ -6,5 +6,5 @@ Exec=system-config-printer-applet
Terminal=false
Type=Application
@ -19954,8 +20001,16 @@ diff -up system-config-printer-1.0.8/print-applet.desktop.in.1.0.x system-config
StartupNotify=false
diff -up system-config-printer-1.0.8/pysmb.py.1.0.x system-config-printer-1.0.8/pysmb.py
--- system-config-printer-1.0.8/pysmb.py.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/pysmb.py 2008-10-15 11:23:12.000000000 +0100
@@ -43,6 +43,7 @@ class AuthContext:
+++ system-config-printer-1.0.8/pysmb.py 2008-10-15 18:07:56.000000000 +0100
@@ -27,6 +27,7 @@ except ImportError:
USE_OLD_CODE=True
import errno
+from gettext import gettext as _
import gobject
import gtk
import os
@@ -43,6 +44,7 @@ class AuthContext:
self.use_user = user
self.use_password = passwd
self.use_workgroup = workgroup
@ -19963,12 +20018,12 @@ diff -up system-config-printer-1.0.8/pysmb.py.1.0.x system-config-printer-1.0.8/
self.parent = parent
def perform_authentication (self):
@@ -69,6 +70,19 @@ class AuthContext:
@@ -69,6 +71,19 @@ class AuthContext:
self.auth_called = False
+ if self.dialog_shown:
+ d = gtk.MessageDialog (self._parent,
+ d = gtk.MessageDialog (self.parent,
+ gtk.DIALOG_MODAL |
+ gtk.DIALOG_DESTROY_WITH_PARENT,
+ gtk.MESSAGE_ERROR,
@ -19983,7 +20038,7 @@ diff -up system-config-printer-1.0.8/pysmb.py.1.0.x system-config-printer-1.0.8/
# After that, prompt
d = gtk.Dialog ("Authentication", self.parent,
gtk.DIALOG_MODAL | gtk.DIALOG_NO_SEPARATOR,
@@ -109,6 +123,7 @@ class AuthContext:
@@ -109,6 +124,7 @@ class AuthContext:
vbox.pack_start (table, False, False, 0)
hbox.pack_start (vbox, False, False, 0)
d.vbox.pack_start (hbox)
@ -19991,9 +20046,37 @@ diff -up system-config-printer-1.0.8/pysmb.py.1.0.x system-config-printer-1.0.8/
d.show_all ()
if self.use_user == 'guest':
@@ -117,7 +133,6 @@ class AuthContext:
username_entry.set_text (self.use_user)
domain_entry.set_text (self.use_workgroup)
response = d.run ()
- d.destroy ()
if response == gtk.RESPONSE_CANCEL:
self.cancel = True
@@ -126,6 +141,7 @@ class AuthContext:
self.use_user = username_entry.get_text ()
self.use_password = password_entry.get_text ()
self.use_workgroup = domain_entry.get_text ()
+ d.destroy ()
return 1
def initial_authentication (self):
diff -up system-config-printer-1.0.8/smburi.py.1.0.x system-config-printer-1.0.8/smburi.py
--- system-config-printer-1.0.8/smburi.py.1.0.x 2008-08-28 14:34:24.000000000 +0100
+++ system-config-printer-1.0.8/smburi.py 2008-10-15 18:07:56.000000000 +0100
@@ -47,7 +47,7 @@ class SMBURI:
uri = "%s%s%s" % (urllib.quote (user),
uri_password,
urllib.quote (group))
- if len (uri) > 0:
+ if len (group) > 0:
uri += '/'
uri += urllib.quote (host)
if len (share) > 0:
diff -up system-config-printer-1.0.8/system-config-printer.glade.1.0.x system-config-printer-1.0.8/system-config-printer.glade
--- system-config-printer-1.0.8/system-config-printer.glade.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/system-config-printer.glade 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/system-config-printer.glade 2008-10-15 18:07:56.000000000 +0100
@@ -67,7 +67,7 @@
</child>
@ -20140,7 +20223,7 @@ diff -up system-config-printer-1.0.8/system-config-printer.glade.1.0.x system-co
<packing>
diff -up system-config-printer-1.0.8/system-config-printer.py.1.0.x system-config-printer-1.0.8/system-config-printer.py
--- system-config-printer-1.0.8/system-config-printer.py.1.0.x 2008-09-29 17:53:53.000000000 +0100
+++ system-config-printer-1.0.8/system-config-printer.py 2008-10-15 11:23:12.000000000 +0100
+++ system-config-printer-1.0.8/system-config-printer.py 2008-10-15 18:07:56.000000000 +0100
@@ -209,7 +209,7 @@ class GUI(GtkGUI, monitor.Watcher):
"btnPrinterPropertiesApply",
"btnPrinterPropertiesClose",

8
system-config-printer.spec
View File

@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.0.8
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@ -151,8 +151,12 @@ rm -rf %buildroot
exit 0
%changelog
* Wed Oct 15 2008 Tim Waugh <twaugh@redhat.com> 1.0.8-5
- Updated patch for 1.0.x changes:
- Fixed SMB authentication (bug #464003).
* Wed Oct 15 2008 Tim Waugh <twaugh@redhat.com> 1.0.8-4
- Added patch for 1.0.x changes:
- Updated patch for 1.0.x changes:
- Removed unneeded debugging output.
- Don't show the applet in KDE (bug #466945).
- Auth/error dialog improvements for SMB as for IPP (bug #465407).