rpms/system-config-printer/F-8 system-config-printer-0.7.74.x.patch, 1.4, 1.5 system-config-printer.spec, 1.139, 1.140

Mon Oct 15 11:34:11 UTC 2007

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29891

Modified Files:
	system-config-printer-0.7.74.x.patch 
	system-config-printer.spec 
Log Message:
* Mon Oct 15 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.4-3
- More fixes from stable branch:
  - More consistency and care in building command lines.
  - Do case-insensitive match when matching model word (Ubuntu #149264).
  - Set translation domain for applet (Ubuntu #149572).
  - Remove toolbar_style property so as not to over-ride the session
    preferences (Ubuntu #135844).


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

Index: system-config-printer-0.7.74.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer-0.7.74.x.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- system-config-printer-0.7.74.x.patch	4 Oct 2007 11:37:02 -0000	1.4
+++ system-config-printer-0.7.74.x.patch	15 Oct 2007 11:34:09 -0000	1.5
@@ -1,7 +1,116 @@
+Index: applet.py
+===================================================================
+--- applet.py	(.../tags/0.7.74.4)	(revision 1676)
++++ applet.py	(.../branches/0.7.74.x)	(revision 1676)
+@@ -175,7 +175,7 @@
+         self.last_refreshed = 0
+         self.special_status_icon = False
+ 
+-        self.xml = gtk.glade.XML(APPDIR + "/" + GLADE)
++        self.xml = gtk.glade.XML(APPDIR + "/" + GLADE, domain = DOMAIN)
+         self.xml.signal_autoconnect(self)
+         self.treeview = self.xml.get_widget ('treeview')
+         text=0
+Index: po/ja.po
+===================================================================
+--- po/ja.po	(.../tags/0.7.74.4)	(revision 1676)
++++ po/ja.po	(.../branches/0.7.74.x)	(revision 1676)
+@@ -2,6 +2,7 @@
+ # translation of ja.po to Japanese
+ # print-conf-gui
+ # Copyright (C) 2001,2002,2003, 2004, 2006, 2007 Free Software Foundation, Inc.
++#
+ # Yukihiro Nakai <ynakai at redhat.com>, 2001.
+ # James Hashida <khashida at redhat.com>, 2002,2003.
+ # Noriko Mizumoto <noriko at redhat.com>, 2003, 2006, 2007.
+@@ -527,9 +528,8 @@
+ msgstr "<b>èª¬æ˜Ž</b> (ã‚ªãƒ—ã‚·ãƒ§ãƒ³)"
+ 
+ #: ../system-config-printer.glade.h:18
+-#, fuzzy
+ msgid "<b>Enter device URI</b>"
+-msgstr "ãƒ‡ãƒã‚¤ã‚¹ URI ã®å…¥åŠ›"
++msgstr "<b>ãƒ‡ãƒã‚¤ã‚¹ URI ã®å…¥åŠ›</b>"
+ 
+ #: ../system-config-printer.glade.h:19
+ msgid "<b>Image Options</b>"
+@@ -568,9 +568,8 @@
+ msgstr "<b>ã“ã®ã‚¯ãƒ©ã‚¹ã®ãƒ¡ãƒ³ãƒãƒ¼ã®ãƒ—ãƒªãƒ³ã‚¿ãƒ¼</b>"
+ 
+ #: ../system-config-printer.glade.h:28
+-#, fuzzy
+ msgid "<b>SMB Printer</b>"
+-msgstr "ãƒ—ãƒªãƒ³ã‚¿ãƒ¼å"
++msgstr "<b>SMB ãƒ—ãƒªãƒ³ã‚¿ãƒ¼</b>"
+ 
+ #: ../system-config-printer.glade.h:29
+ msgid "<b>Select Connection</b>"
+@@ -647,9 +646,8 @@
+ msgstr "æ¬¡ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’é™¤ã„ã¦å…¨å“¡ã«å°åˆ·ã‚’è¨±å¯ã™ã‚‹:"
+ 
+ #: ../system-config-printer.glade.h:49
+-#, fuzzy
+ msgid "Allow printing from the Internet"
+-msgstr "æ¬¡ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’é™¤ã„ã¦å…¨å“¡ã«å°åˆ·ã‚’è¨±å¯ã™ã‚‹:"
++msgstr "ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã®å°åˆ·ã‚’è¨±å¯ã™ã‚‹"
+ 
+ #: ../system-config-printer.glade.h:50
+ msgid "Allow remote administration"
+@@ -657,8 +655,7 @@
+ 
+ #: ../system-config-printer.glade.h:51
+ msgid "Allow users to cancel any job (not just their own)"
+-msgstr ""
+-"ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«ä¾é ¼ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«ã™ã‚‹ã“ã¨ã‚’è¨±å¯ã™ã‚‹ (å½¼ã‚‰è‡ªèº«ã®ã‚‚ã®ã§ãªãã¦ã‚‚)"
++msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«ä¾é ¼ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«ã™ã‚‹ã“ã¨ã‚’è¨±å¯ã™ã‚‹ (å½¼ã‚‰è‡ªèº«ã®ã‚‚ã®ã§ãªãã¦ã‚‚)"
+ 
+ #: ../system-config-printer.glade.h:52
+ msgid "Apply"
+@@ -941,8 +938,7 @@
+ 
+ #: ../system-config-printer.glade.h:134
+ msgid "May contain any printable characters except \"/\", \"#\", and space"
+-msgstr ""
+-"\"/\"ã€ \"#\"ã€ ç©ºç™½ä»¥å¤–ãªã‚‰å°åˆ·ã§ãã‚‹æ–‡å—ã¯ã™ã¹ã¦å«ã¾ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™"
++msgstr "\"/\"ã€ \"#\"ã€ ç©ºç™½ä»¥å¤–ãªã‚‰å°åˆ·ã§ãã‚‹æ–‡å—ã¯ã™ã¹ã¦å«ã¾ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™"
+ 
+ #: ../system-config-printer.glade.h:135
+ msgid "Media:"
+@@ -1076,7 +1072,7 @@
+ 
+ #: ../system-config-printer.glade.h:183
+ msgid "Please Wait"
+-msgstr ""
++msgstr "ãŠå¾…ã¡ãã ã•ã„"
+ 
+ #: ../system-config-printer.glade.h:184
+ msgid "Policies"
+@@ -1306,7 +1302,7 @@
+ 
+ #: ../system-config-printer.glade.h:237
+ msgid "_Install"
+-msgstr ""
++msgstr "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«(_I)"
+ 
+ #: ../system-config-printer.glade.h:238
+ msgid "_Verify..."
+@@ -1611,12 +1607,3 @@
+ msgid "Select default printer"
+ msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ—ãƒªãƒ³ã‚¿ãƒ¼ã‚’é¸æŠžã™ã‚‹"
+ 
+-#~ msgid ""
+-#~ "This PPD is provided by the manufacturer and is included with the "
+-#~ "foomatic package."
+-#~ msgstr ""
+-#~ "ã“ã® PPD ã¯è£½é€ ãƒ¡ãƒ¼ã‚«ãƒ¼ã‹ã‚‰æä¾›ã•ã‚Œã¦ãŠã‚Š foomatic ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’å«ã‚“ã§ã„ã¾"
+-#~ "ã™ã€‚"
+-
+-#~ msgid "This PPD is provided by CUPS."
+-#~ msgstr "ã“ã® PPD ã¯ CUPS ã‹ã‚‰æä¾›ã•ã‚Œã¦ã„ã¾ã™ã€‚"
 Index: my-default-printer.py
 ===================================================================
---- my-default-printer.py	(.../tags/0.7.74.4)	(revision 1654)
-+++ my-default-printer.py	(.../branches/0.7.74.x)	(revision 1654)
+--- my-default-printer.py	(.../tags/0.7.74.4)	(revision 1676)
++++ my-default-printer.py	(.../branches/0.7.74.x)	(revision 1676)
 @@ -26,7 +26,7 @@
  import signal
  import sys
@@ -11,11 +120,202 @@
  import locale
  locale.setlocale (locale.LC_ALL, "")
  from gettext import gettext as _
+Index: pysmb.py
+===================================================================
+--- pysmb.py	(.../tags/0.7.74.4)	(revision 1676)
++++ pysmb.py	(.../branches/0.7.74.x)	(revision 1676)
+@@ -3,8 +3,8 @@
+ ## system-config-printer
+ ## CUPS backend
+  
+-## Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
+-## Copyright (C) 2002, 2003 Tim Waugh <twaugh at redhat.com>
++## Copyright (C) 2002, 2003, 2006, 2007 Red Hat, Inc.
++## Copyright (C) 2002, 2003, 2006, 2007 Tim Waugh <twaugh at redhat.com>
+  
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+@@ -72,7 +72,8 @@
+     ips = []
+     signal.signal (signal.SIGCHLD, signal.SIG_DFL)
+     if wins:
+-    	str = "LC_ALL=C %s -U %s -M -- - 2>&1" % (nmblookup, wins)
++    	os.environ['WINS'] = wins
++    	str = 'LC_ALL=C %s -U "$WINS" -M -- - 2>&1' % (nmblookup)
+     else:
+     	str = "LC_ALL=C %s -M -- - 2>&1" % (nmblookup)
+     for l in os.popen (str, 'r').readlines ():
+@@ -81,7 +82,8 @@
+             ips.append (l.split(" ")[0])
+     if len (ips) <= 0:
+         if wins:
+-            str = "LC_ALL=C %s -U %s '*' 2>&1" % (nmblookup, wins)
++	    os.environ['WINS'] = wins
++            str = 'LC_ALL=C %s -U "$WINS" "*" 2>&1' % (nmblookup)
+ 	else:
+             str = "LC_ALL=C %s '*' 2>&1" % (nmblookup)
+ 	for l in os.popen (str, 'r').readlines ():
+@@ -91,10 +93,12 @@
+     for ip in ips:
+         dom = None
+     	dict = { 'IP': ip }
++	os.environ["IP"] = ip
+ 	if wins:
+-    		str = "LC_ALL=C " + nmblookup + " -U " + wins + " -A " + ip
++		os.environ["WINS"] = wins
++    		str = 'LC_ALL=C %s -U "$WINS" -A "$IP"' % (nmblookup)
+ 	else:
+-    		str = "LC_ALL=C %s -A '%s'" % (nmblookup, ip)
++    		str = 'LC_ALL=C %s -A "$IP"' % (nmblookup)
+ 	str += " 2>&1"
+ 	for line in os.popen(str, 'r').readlines():
+ 		line = line.splitlines()[0]
+@@ -120,7 +124,8 @@
+         domainregex = re.compile("\s*Workgroup\s*Master")
+         commentregex = re.compile("(\s*-+)+")
+         signal.signal (signal.SIGCHLD, signal.SIG_DFL)
+-	str = " %s -N -L //%s 2>/dev/null" % (smbclient, dmbip)
++	os.environ["DMBIP"] = dmbip
++	str = 'LC_ALL=C %s -N -L "//$DMBIP" 2>/dev/null' % (smbclient)
+         for l in os.popen (str, 'r').readlines ():
+                 l = l.splitlines()[0]
+ 
+@@ -175,10 +180,12 @@
+     for ip in ips:
+         name = None
+     	dict = { 'IP': ip }
++	os.environ["IP"] = ip
+ 	if wins:
+-    		str = "LC_ALL=C " + nmblookup + " -U " + wins + " -A " + ip
++    		os.environ["WINS"] = wins
++    		str = 'LC_ALL=C %s -U "$WINS" -A "$IP"' % (nmblookup)
+ 	else:
+-    		str = "LC_ALL=C %s -A '%s'" % (nmblookup, ip)
++    		str = 'LC_ALL=C %s -A "$IP"' % (nmblookup)
+ 	str += " 2>&1"
+ 	for line in os.popen(str, 'r').readlines():
+ 		line = line.splitlines()[0]
+@@ -198,10 +205,12 @@
+     """Given an SMB name, returns a host dict for it."""
+     dict = { 'NAME': smbname, 'IP': '', 'GROUP': '' }
+     global wins
++    os.environ["SMBNAME"] = smbname
+     if wins:
+-    	str = "LC_ALL=C %s -U %s -S '%s' 2>&1" % (nmblookup, wins, smbname)
++    	os.environ["WINS"] = wins
++    	str = 'LC_ALL=C %s -U "$WINS" -S "$SMBNAME" 2>&1' % (nmblookup)
+     else:
+-    	str = "LC_ALL=C %s -S '%s' 2>&1" % (nmblookup, smbname)
++    	str = 'LC_ALL=C %s -S "$SMBNAME" 2>&1' % (nmblookup)
+     for l in os.popen (str, 'r').readlines ():
+         l = l.strip ()
+         if l.endswith ("<00>"):
+@@ -227,12 +236,15 @@
+     if not os.access (smbclient, os.X_OK):
+         return printers
+ 
+-    str = "LC_ALL=C %s -N -L '%s' 2>&1" % (smbclient, host['NAME'])
++    os.environ["NAME"] = host['NAME']
++    str = 'LC_ALL=C %s -N -L "$NAME" 2>&1' % (smbclient)
+     if host.has_key ('IP'):
+-	str += " -I '%s'" % host['IP']
++	os.environ["IP"] = host['IP']
++	str += ' -I "$IP"'
+ 
+     if host.has_key ('GROUP'):
+-        str += " -W '%s'" % host['GROUP']
++        os.environ["GROUP"] = host['GROUP']
++        str += ' -W "$GROUP"'
+ 
+     signal.signal (signal.SIGCHLD, signal.SIG_DFL)
+     section = 0
+@@ -310,7 +322,7 @@
+             os.dup2 (write, 1)
+         os.dup2 (1, 2)
+ 
+-        os.environ['LANG'] = 'C'
++        os.environ['LC_ALL'] = 'C'
+         os.execv (args[0], args)
+         sys.exit (1)
+ 
+Index: system-config-printer.glade
+===================================================================
+--- system-config-printer.glade	(.../tags/0.7.74.4)	(revision 1676)
++++ system-config-printer.glade	(.../branches/0.7.74.x)	(revision 1676)
+@@ -183,7 +183,6 @@
+ 	<widget class="GtkToolbar" id="toolbar1">
+ 	  <property name="visible">True</property>
+ 	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+-	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+ 	  <property name="tooltips">True</property>
+ 	  <property name="show_arrow">True</property>
+ 
+@@ -195,7 +194,7 @@
+ 	      <property name="stock_id">gtk-new</property>
+ 	      <property name="visible_horizontal">True</property>
+ 	      <property name="visible_vertical">True</property>
+-	      <property name="is_important">False</property>
++	      <property name="is_important">True</property>
+ 	      <signal name="clicked" handler="on_new_printer_activate" last_modification_time="Wed, 22 Feb 2006 15:25:39 GMT"/>
+ 	    </widget>
+ 	    <packing>
+@@ -212,7 +211,7 @@
+ 	      <property name="stock_id">gtk-new</property>
+ 	      <property name="visible_horizontal">True</property>
+ 	      <property name="visible_vertical">True</property>
+-	      <property name="is_important">False</property>
++	      <property name="is_important">True</property>
+ 	      <signal name="clicked" handler="on_new_class_activate" last_modification_time="Wed, 22 Feb 2006 15:25:55 GMT"/>
+ 	    </widget>
+ 	    <packing>
+@@ -227,7 +226,7 @@
+ 	      <property name="stock_id">gtk-copy</property>
+ 	      <property name="visible_horizontal">True</property>
+ 	      <property name="visible_vertical">True</property>
+-	      <property name="is_important">False</property>
++	      <property name="is_important">True</property>
+ 	      <signal name="clicked" handler="on_copy_activate" last_modification_time="Wed, 22 Feb 2006 15:26:11 GMT"/>
+ 	    </widget>
+ 	    <packing>
+@@ -242,7 +241,7 @@
+ 	      <property name="stock_id">gtk-delete</property>
+ 	      <property name="visible_horizontal">True</property>
+ 	      <property name="visible_vertical">True</property>
+-	      <property name="is_important">False</property>
++	      <property name="is_important">True</property>
+ 	      <signal name="clicked" handler="on_delete_activate" last_modification_time="Wed, 22 Feb 2006 15:26:26 GMT"/>
+ 	    </widget>
+ 	    <packing>
 Index: ChangeLog
 ===================================================================
---- ChangeLog	(.../tags/0.7.74.4)	(revision 1654)
-+++ ChangeLog	(.../branches/0.7.74.x)	(revision 1654)
-@@ -1,5 +1,15 @@
+--- ChangeLog	(.../tags/0.7.74.4)	(revision 1676)
++++ ChangeLog	(.../branches/0.7.74.x)	(revision 1676)
+@@ -1,5 +1,40 @@
++2007-10-15  Tim Waugh  <twaugh at redhat.com>
++
++	* Makefile.am (fix-glade): Remove toolbar_style property so as not
++	to over-ride the session preferences (Ubuntu #135844).
++
++	* applet.py (JobManager.__init__): Set text domain for Glade
++	(Ubuntu #149572).
++
++2007-10-05  Tim Waugh  <twaugh at redhat.com>
++
++	* ppds.py (PPDs._findBestMatchPPDs): Efficiency improvement (don't
++	run lower() on the loop-constant string).
++	(PPDs._findBestMatchPPDs): The model search should be performed in
++	model order.
++
++2007-10-05  Till Kamppeter  <till.kamppeter at gmail.com>
++
++	* ppds.py (_findBestMatchPPDs): Do case-insensitive match when
++	matching "most important" word. Especially important for matching
++	Canon printers (Ubuntu #149264).
++
++2007-10-05  Tim Waugh  <twaugh at redhat.com>
++
++	* pysmb.py: More consistency and care in building command lines.
++
 +2007-10-03  Till Kamppeter  <till.kamppeter at gmail.com>
 +
 +	* my-default-printer.py: Corrected gettext domain (Ubuntu #147788).
@@ -31,10 +331,35 @@
  	* configure.in: Version 0.7.74.4.
  
  2007-10-02  Tim Waugh  <twaugh at redhat.com>
+Index: ppds.py
+===================================================================
+--- ppds.py	(.../tags/0.7.74.4)	(revision 1676)
++++ ppds.py	(.../branches/0.7.74.x)	(revision 1676)
+@@ -503,9 +503,10 @@
+             # field and look for a match based solely on that.  If
+             # there are digits, try lowering the number of
+             # significant figures.
++            mdlnames.sort (cups.modelSort)
+             mdlitems = map (lambda x: (x.lower (), mdls[x]), mdlnames)
+             modelid = None
+-            for word in mdl.split (' '):
++            for word in mdll.split (' '):
+                 if modelid == None:
+                     modelid = word
+ 
+@@ -547,7 +548,7 @@
+ 
+                 for (name, ppds) in mdlitems:
+                     for word in name.split (' '):
+-                        if word == modelid:
++                        if word.lower () == modelid:
+                             found = True
+                             break
+ 
 Index: system-config-printer.py
 ===================================================================
---- system-config-printer.py	(.../tags/0.7.74.4)	(revision 1654)
-+++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1654)
+--- system-config-printer.py	(.../tags/0.7.74.4)	(revision 1676)
++++ system-config-printer.py	(.../branches/0.7.74.x)	(revision 1676)
 @@ -1392,6 +1392,16 @@
              return True
          self.changed = set() # of options
@@ -52,3 +377,16 @@
          if class_deleted:
              self.populateList ()
          else:
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(.../tags/0.7.74.4)	(revision 1676)
++++ Makefile.am	(.../branches/0.7.74.x)	(revision 1676)
+@@ -121,7 +121,7 @@
+ 		<(cd po; ls -1 *.po | sed -e "s,\.po$$,,")'
+ 
+ fix-glade:
+-	sed -i -e '/invisible_char/d' *.glade
++	sed -i -e '/invisible_char/d' -e '/toolbar_style/d' *.glade
+ 
+ run:
+ 	SYSTEM_CONFIG_PRINTER_GLADE=$(top_srcdir)/system-config-printer.glade \


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- system-config-printer.spec	4 Oct 2007 11:37:02 -0000	1.139
+++ system-config-printer.spec	15 Oct 2007 11:34:09 -0000	1.140
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -127,6 +127,14 @@
 exit 0
 
 %changelog
+* Mon Oct 15 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.4-3
+- More fixes from stable branch:
+  - More consistency and care in building command lines.
+  - Do case-insensitive match when matching model word (Ubuntu #149264).
+  - Set translation domain for applet (Ubuntu #149572).
+  - Remove toolbar_style property so as not to over-ride the session
+    preferences (Ubuntu #135844).
+
 * Wed Oct  3 2007 Tim Waugh <twaugh at redhat.com> 0.7.74.4-2
 - Include two more fixes from stable branch.
 - No need to run update-desktop-database because there are no MimeKey


