rpms/system-config-printer/devel system-config-printer-scp-git.patch, 1.1, 1.2 system-config-printer.spec, 1.281, 1.282
Tim Waugh
twaugh at fedoraproject.org
Thu Aug 20 17:21:20 UTC 2009
- Previous message (by thread): rpms/sys_basher/EL-5 import.log, NONE, 1.1 sys_basher.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/openssl/devel openssl-1.0.0-beta3-fips.patch,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2568
Modified Files:
system-config-printer-scp-git.patch system-config-printer.spec
Log Message:
* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-6
- Applied patch from 1.1.x (52a73b6).
- Better printer icons representing status (bug #518020).
- Use paused ico nwhen printer state reason is 'paused'.
- Job status icon and state reason in jobs treeview (bug #518070).
- Job creation times display fixes.
- Use preferred object path for AuthenticationAgent (bug #518427).
system-config-printer-scp-git.patch:
ChangeLog-OLD | 5
Makefile.am | 1
PhysicalDevice.py | 3
ToolbarSearchEntry.py | 2
applet.py | 3
authconn.py | 4
cupshelpers/cupshelpers.py | 5
cupshelpers/ppds.py | 19
cupspk.py | 80 ++-
jobviewer.py | 375 +++++++++-----
optionwidgets.py | 3
po/ar.po | 522 ++++++++++---------
po/as.po | 522 ++++++++++---------
po/bg.po | 522 ++++++++++---------
po/bn.po | 523 ++++++++++---------
po/bn_IN.po | 519 ++++++++++---------
po/bs.po | 522 ++++++++++---------
po/ca.po | 522 ++++++++++---------
po/cs.po | 522 ++++++++++---------
po/cy.po | 523 ++++++++++---------
po/da.po | 522 ++++++++++---------
po/de.po | 531 ++++++++++----------
po/el.po | 522 ++++++++++---------
po/en_GB.po | 519 ++++++++++---------
po/es.po | 1103 +++++++++++++++++-------------------------
po/et.po | 522 ++++++++++---------
po/fa.po | 523 ++++++++++---------
po/fi.po | 522 ++++++++++---------
po/fr.po | 522 ++++++++++---------
po/gu.po | 519 ++++++++++---------
po/he.po | 525 ++++++++++---------
po/hi.po | 519 ++++++++++---------
po/hr.po | 522 ++++++++++---------
po/hu.po | 531 ++++++++++----------
po/hy.po | 516 ++++++++++---------
po/id.po | 523 ++++++++++---------
po/is.po | 522 ++++++++++---------
po/it.po | 519 ++++++++++---------
po/ja.po | 519 ++++++++++---------
po/ka.po | 516 ++++++++++---------
po/kn.po | 519 ++++++++++---------
po/ko.po | 519 ++++++++++---------
po/lo.po | 516 ++++++++++---------
po/lv.po | 522 ++++++++++---------
po/mai.po | 519 ++++++++++---------
po/mk.po | 523 ++++++++++---------
po/ml.po | 519 ++++++++++---------
po/mr.po | 519 ++++++++++---------
po/ms.po | 523 ++++++++++---------
po/my.po | 516 ++++++++++---------
po/nb.po | 522 ++++++++++---------
po/nl.po | 519 ++++++++++---------
po/nn.po | 523 ++++++++++---------
po/or.po | 519 ++++++++++---------
po/pa.po | 519 ++++++++++---------
po/pl.po | 670 +++++++++++++------------
po/pt.po | 522 ++++++++++---------
po/pt_BR.po | 522 ++++++++++---------
po/ro.po | 519 ++++++++++---------
po/ru.po | 519 ++++++++++---------
po/si.po | 519 ++++++++++---------
po/sk.po | 522 ++++++++++---------
po/sl.po | 523 ++++++++++---------
po/sr.po | 522 ++++++++++---------
po/sr at latin.po | 522 ++++++++++---------
po/sv.po | 519 ++++++++++---------
po/ta.po | 519 ++++++++++---------
po/te.po | 519 ++++++++++---------
po/th.po | 522 ++++++++++---------
po/tr.po | 523 ++++++++++---------
po/uk.po | 522 ++++++++++---------
po/vi.po | 519 ++++++++++---------
po/zh_CN.po | 519 ++++++++++---------
po/zh_TW.po | 519 ++++++++++---------
system-config-printer.py | 190 +++++--
timedops.py | 5
udev/udev-configure-printer.c | 4
77 files changed, 17581 insertions(+), 16670 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 system-config-printer-scp-git.patchIndex: system-config-printer-scp-git.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-scp-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-scp-git.patch 19 Aug 2009 17:05:16 -0000 1.1
+++ system-config-printer-scp-git.patch 20 Aug 2009 17:21:19 -0000 1.2
@@ -1,6 +1,6 @@
diff -up system-config-printer-1.1.11/applet.py.scp-git system-config-printer-1.1.11/applet.py
--- system-config-printer-1.1.11/applet.py.scp-git 2009-08-07 17:42:59.000000000 +0100
-+++ system-config-printer-1.1.11/applet.py 2009-08-19 17:51:49.110701234 +0100
++++ system-config-printer-1.1.11/applet.py 2009-08-20 17:50:51.385793784 +0100
@@ -88,7 +88,8 @@ class NewPrinterNotification(dbus.servic
def GetReady (self):
self.wake_up ()
@@ -13,7 +13,7 @@ diff -up system-config-printer-1.1.11/ap
gobject.timeout_add (60 * 1000, self.timeout_ready)
diff -up system-config-printer-1.1.11/authconn.py.scp-git system-config-printer-1.1.11/authconn.py
--- system-config-printer-1.1.11/authconn.py.scp-git 2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/authconn.py 2009-08-19 17:51:49.112701196 +0100
++++ system-config-printer-1.1.11/authconn.py 2009-08-20 17:50:51.387792339 +0100
@@ -22,6 +22,7 @@ import cups
import cupspk
import gobject
@@ -34,7 +34,7 @@ diff -up system-config-printer-1.1.11/au
else:
diff -up system-config-printer-1.1.11/ChangeLog-OLD.scp-git system-config-printer-1.1.11/ChangeLog-OLD
--- system-config-printer-1.1.11/ChangeLog-OLD.scp-git 2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/ChangeLog-OLD 2009-08-19 17:51:49.101700079 +0100
++++ system-config-printer-1.1.11/ChangeLog-OLD 2009-08-20 17:50:51.376791347 +0100
@@ -1,3 +1,8 @@
+2009-08-11 Tim Waugh <twaugh at redhat.com>
+
@@ -46,8 +46,16 @@ diff -up system-config-printer-1.1.11/Ch
* system-config-printer.py (NewPrinterGUI.nextNPTab): Don't log
diff -up system-config-printer-1.1.11/cupshelpers/cupshelpers.py.scp-git system-config-printer-1.1.11/cupshelpers/cupshelpers.py
--- system-config-printer-1.1.11/cupshelpers/cupshelpers.py.scp-git 2009-08-05 11:33:24.000000000 +0100
-+++ system-config-printer-1.1.11/cupshelpers/cupshelpers.py 2009-08-19 17:51:49.114700998 +0100
-@@ -642,6 +642,10 @@ def missingPackagesAndExecutables(ppd):
++++ system-config-printer-1.1.11/cupshelpers/cupshelpers.py 2009-08-20 17:50:51.389792042 +0100
+@@ -89,6 +89,7 @@ class Printer:
+ if self.is_shared is None:
+ self.is_shared = not self.not_shared
+ del self.not_shared
++ self.other_attributes = kw
+
+ def getAttributes(self):
+ """
+@@ -642,6 +643,10 @@ def missingPackagesAndExecutables(ppd):
# First, a local function. How to check that something exists
# in a path:
def pathcheck (name, path="/usr/bin:/bin"):
@@ -60,7 +68,7 @@ diff -up system-config-printer-1.1.11/cu
if p != -1:
diff -up system-config-printer-1.1.11/cupshelpers/ppds.py.scp-git system-config-printer-1.1.11/cupshelpers/ppds.py
--- system-config-printer-1.1.11/cupshelpers/ppds.py.scp-git 2009-08-07 17:50:41.000000000 +0100
-+++ system-config-printer-1.1.11/cupshelpers/ppds.py 2009-08-19 17:51:49.116700675 +0100
++++ system-config-printer-1.1.11/cupshelpers/ppds.py 2009-08-20 17:50:51.391791710 +0100
@@ -180,6 +180,7 @@ def ppdMakeModelSplit (ppd_make_and_mode
" ps3",
" pxl",
@@ -69,23 +77,6 @@ diff -up system-config-printer-1.1.11/cu
","]:
s = modell.find (suffix)
if s != -1:
-@@ -208,14 +209,14 @@ def ppdMakeModelSplit (ppd_make_and_mode
- # Some drivers are just generally better than others.
- # Here is the preference list:
- DRIVER_TYPE_DOWNLOADED_NOW = 5
--DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT = 8
- DRIVER_TYPE_VENDOR = 10
--DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT = 15
- DRIVER_TYPE_HPCUPS = 16
- DRIVER_TYPE_FOOMATIC_HPIJS_ON_HP = 17
- DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED = 20
- DRIVER_TYPE_GUTENPRINT_NATIVE = 25
- DRIVER_TYPE_SPLIX = 27
-+DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT = 28
-+DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT = 29
- DRIVER_TYPE_FOOMATIC_PS = 30
- DRIVER_TYPE_FOOMATIC_HPIJS = 40
- DRIVER_TYPE_FOOMATIC_GUTENPRINT_SIMPLIFIED = 50
@@ -229,12 +230,6 @@ def _getDriverType (ppdname, ppds=None):
"""Decides which of the above types ppdname is."""
if ppdname.find ("turboprint") != -1:
@@ -112,9 +103,22 @@ diff -up system-config-printer-1.1.11/cu
if ppdname.find ("-hpijs") != -1:
if ppdname.find ("hpijs-rss") == -1:
return DRIVER_TYPE_FOOMATIC_HPIJS
+@@ -419,12 +420,6 @@ class PPDs:
+ if t == DRIVER_TYPE_FOOMATIC_HPIJS:
+ # Prefer HPIJS for HP devices.
+ t = DRIVER_TYPE_FOOMATIC_HPIJS_ON_HP
+- # For HP LaserJet 12xx/13xx prefer HPIJS over
+- # PostScript, as they do not have enough memory
+- # to render complex graphics with their on-board
+- # PostScript interpreter
+- if re.search(r"(?i)HP[-_]LaserJet_1[23]\d\d", x):
+- t = DRIVER_TYPE_FOOMATIC_RECOMMENDED_NON_POSTSCRIPT
+ return t
+
+ def sort_ppdnames (a, b):
diff -up system-config-printer-1.1.11/cupspk.py.scp-git system-config-printer-1.1.11/cupspk.py
--- system-config-printer-1.1.11/cupspk.py.scp-git 2009-08-05 11:33:24.000000000 +0100
-+++ system-config-printer-1.1.11/cupspk.py 2009-08-19 17:51:49.119702393 +0100
++++ system-config-printer-1.1.11/cupspk.py 2009-08-20 17:50:51.394792432 +0100
@@ -1,8 +1,8 @@
# vim: set ts=4 sw=4 et: coding=UTF-8
#
@@ -134,6 +138,15 @@ diff -up system-config-printer-1.1.11/cu
import cups
import dbus
+@@ -41,7 +40,7 @@ from dbus.mainloop.glib import DBusGMain
+ DBusGMainLoop(set_as_default=True)
+
+ PK_AUTH_NAME = 'org.freedesktop.PolicyKit.AuthenticationAgent'
+-PK_AUTH_PATH = '/'
++PK_AUTH_PATH = '/org/gnome/PolicyKit/Manager'
+ PK_AUTH_IFACE = 'org.freedesktop.PolicyKit.AuthenticationAgent'
+
+ CUPS_PK_NAME = 'org.opensuse.CupsPkHelper.Mechanism'
@@ -152,7 +151,7 @@ class Connection:
pk_auth_running = False
@@ -231,8 +244,118 @@ diff -up system-config-printer-1.1.11/cu
diff -up system-config-printer-1.1.11/gtk_treeviewtooltips.py.scp-git system-config-printer-1.1.11/gtk_treeviewtooltips.py
diff -up system-config-printer-1.1.11/jobviewer.py.scp-git system-config-printer-1.1.11/jobviewer.py
--- system-config-printer-1.1.11/jobviewer.py.scp-git 2009-08-07 17:42:59.000000000 +0100
-+++ system-config-printer-1.1.11/jobviewer.py 2009-08-19 17:51:49.123700820 +0100
-@@ -324,15 +324,18 @@ class JobViewer (GtkGUI, monitor.Watcher
++++ system-config-printer-1.1.11/jobviewer.py 2009-08-20 17:50:51.399792481 +0100
+@@ -209,30 +209,44 @@ class JobViewer (GtkGUI, monitor.Watcher
+
+ self.job_menubar_item.set_submenu (self.job_context_menu)
+
+- text=0
+- for name in [_("Job"),
+- _("User"),
+- _("Document"),
+- _("Printer"),
+- _("Size"),
+- _("Time submitted"),
+- _("Status")]:
+- if text == 1 and trayicon:
++ for skip, ellipsize, name, setter in \
++ [(False, False, _("Job"), self._set_job_job_number_text),
++ (True, False, _("User"), self._set_job_user_text),
++ (False, True, _("Document"), self._set_job_document_text),
++ (False, True, _("Printer"), self._set_job_printer_text),
++ (False, False, _("Size"), self._set_job_size_text)]:
++ if trayicon and skip:
+ # Skip the user column for the trayicon.
+- text += 1
+ continue
++
+ cell = gtk.CellRendererText()
+- if text == 2 or text == 3:
++ if ellipsize:
+ # Ellipsize the 'Document' and 'Printer' columns.
+ cell.set_property ("ellipsize", pango.ELLIPSIZE_END)
+ cell.set_property ("width-chars", 20)
+- column = gtk.TreeViewColumn(name, cell, text=text)
++ column = gtk.TreeViewColumn(name, cell)
++ column.set_cell_data_func (cell, setter)
+ column.set_resizable(True)
+ self.treeview.append_column(column)
+- text += 1
++
++ cell = gtk.CellRendererText ()
++ column = gtk.TreeViewColumn (_("Time submitted"), cell, text=1)
++ column.set_resizable (True)
++ self.treeview.append_column (column)
++
++ column = gtk.TreeViewColumn (_("Status"))
++ icon = gtk.CellRendererPixbuf ()
++ column.pack_start (icon, False)
++ text = gtk.CellRendererText ()
++ text.set_property ("ellipsize", pango.ELLIPSIZE_END)
++ text.set_property ("width-chars", 20)
++ column.pack_start (text, True)
++ column.set_cell_data_func (icon, self._set_job_status_icon)
++ column.set_cell_data_func (text, self._set_job_status_text)
++ self.treeview.append_column (column)
+
+ self.treeview.get_selection().set_mode(gtk.SELECTION_SINGLE)
+- self.store = gtk.TreeStore(int, str, str, str, str, str, str)
++ self.store = gtk.TreeStore(int, str)
+ self.store.set_sort_column_id (0, gtk.SORT_DESCENDING)
+ self.treeview.set_model(self.store)
+ self.treeview.set_rules_hint (True)
+@@ -267,24 +281,24 @@ class JobViewer (GtkGUI, monitor.Watcher
+
+ self.statusbar_set = False
+
++ theme = gtk.icon_theme_get_default ()
++ self.icon_jobs = theme.load_icon (ICON, 22, 0)
++ self.icon_jobs_processing = theme.load_icon ("printer-printing",
++ 22, 0)
[...94456 lines suppressed...]
printer.job_sheets_supported,
printer.job_sheet_start,
@@ -2115,7 +93610,7 @@ diff -up system-config-printer-1.1.11/sy
self.fillComboBox(self.cmbPEndBanner, printer.job_sheets_supported,
printer.job_sheet_end,
ppdippstr.job_sheets)
-@@ -2592,7 +2608,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2592,7 +2643,7 @@ class GUI(GtkGUI, monitor.Watcher):
self.updateMarkerLevels ()
self.updateStateReasons ()
@@ -2124,7 +93619,7 @@ diff -up system-config-printer-1.1.11/sy
def fillPrinterOptions(self, name, editable):
# remove Class membership tab
-@@ -2912,7 +2928,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2912,7 +2963,7 @@ class GUI(GtkGUI, monitor.Watcher):
except cups.HTTPError, (s,):
show_HTTP_Error (s, self.PrintersWindow)
# Not fatal.
@@ -2133,7 +93628,7 @@ diff -up system-config-printer-1.1.11/sy
show_IPP_Error (e, msg, self.PrintersWindow)
# Not fatal.
-@@ -3034,8 +3050,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3034,8 +3085,8 @@ class GUI(GtkGUI, monitor.Watcher):
return
try:
@@ -2144,7 +93639,7 @@ diff -up system-config-printer-1.1.11/sy
name = model.get_value (iter, 2)
self.cups._begin_operation (_("deleting printer %s") % name)
name = unicode (name)
-@@ -3056,8 +3072,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3056,8 +3107,8 @@ class GUI(GtkGUI, monitor.Watcher):
iconview = self.dests_iconview
paths = iconview.get_selected_items ()
model = iconview.get_model ()
@@ -2155,7 +93650,7 @@ diff -up system-config-printer-1.1.11/sy
printer = model.get_value (iter, 0)
name = unicode (model.get_value (iter, 2), 'utf-8')
self.cups._begin_operation (_("modifying printer %s") % name)
-@@ -3082,8 +3098,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3082,8 +3133,8 @@ class GUI(GtkGUI, monitor.Watcher):
paths = iconview.get_selected_items ()
model = iconview.get_model ()
success = False
@@ -2166,7 +93661,7 @@ diff -up system-config-printer-1.1.11/sy
printer = model.get_value (iter, 0)
self.cups._begin_operation (_("modifying printer %s") %
printer.name)
-@@ -3423,10 +3439,16 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -3423,10 +3474,16 @@ class GUI(GtkGUI, monitor.Watcher):
def printer_event (self, mon, printer, eventname, event):
monitor.Watcher.printer_event (self, mon, printer, eventname, event)
@@ -2183,7 +93678,7 @@ diff -up system-config-printer-1.1.11/sy
if self.PrinterPropertiesDialog.get_property('visible'):
self.printer.getAttributes ()
self.updatePrinterProperties ()
-@@ -3491,7 +3513,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -3491,7 +3548,6 @@ class NewPrinterGUI(GtkGUI):
def __init__(self, mainapp):
self.mainapp = mainapp
@@ -2191,7 +93686,7 @@ diff -up system-config-printer-1.1.11/sy
self.language = mainapp.language
self.options = {} # keyword -> Option object
-@@ -3590,6 +3611,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -3590,6 +3646,9 @@ class NewPrinterGUI(GtkGUI):
"tvNPDownloadableDriverLicense",
"rbtnNPDownloadLicenseYes",
"rbtnNPDownloadLicenseNo"],
@@ -2201,7 +93696,7 @@ diff -up system-config-printer-1.1.11/sy
"SMBBrowseDialog":
["SMBBrowseDialog",
"tvSMBBrowser",
-@@ -3604,8 +3628,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -3604,8 +3663,6 @@ class NewPrinterGUI(GtkGUI):
dialog.connect ("delete-event", on_delete_just_hide)
# share with mainapp
@@ -2210,7 +93705,7 @@ diff -up system-config-printer-1.1.11/sy
self.busy = mainapp.busy
self.ready = mainapp.ready
-@@ -3684,7 +3706,8 @@ class NewPrinterGUI(GtkGUI):
+@@ -3684,7 +3741,8 @@ class NewPrinterGUI(GtkGUI):
self.SMBBrowseDialog.set_transient_for(self.NewPrinterWindow)
@@ -2220,7 +93715,7 @@ diff -up system-config-printer-1.1.11/sy
ppd_filter = gtk.FileFilter()
ppd_filter.set_name(_("PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"))
-@@ -3873,7 +3896,12 @@ class NewPrinterGUI(GtkGUI):
+@@ -3873,7 +3931,12 @@ class NewPrinterGUI(GtkGUI):
self.auto_model = 'Queue'
try:
@@ -2234,7 +93729,7 @@ diff -up system-config-printer-1.1.11/sy
except cups.IPPError, (e, m):
show_IPP_Error (e, m, parent=self.mainapp.PrintersWindow)
return
-@@ -3953,9 +3981,10 @@ class NewPrinterGUI(GtkGUI):
+@@ -3953,9 +4016,10 @@ class NewPrinterGUI(GtkGUI):
_('Searching') + '</span>\n\n' +
_('Searching for downloadable drivers'))
if not parent:
@@ -2246,7 +93741,7 @@ diff -up system-config-printer-1.1.11/sy
if self.mainapp.cups == None:
debugprint("CUPS connection lost, reconnecting ...")
-@@ -4032,9 +4061,10 @@ class NewPrinterGUI(GtkGUI):
+@@ -4032,9 +4096,10 @@ class NewPrinterGUI(GtkGUI):
_('Searching') + '</span>\n\n' +
_('Searching for drivers'))
if not parent:
@@ -2259,7 +93754,7 @@ diff -up system-config-printer-1.1.11/sy
while gtk.events_pending ():
gtk.main_iteration ()
-@@ -4347,6 +4377,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4347,6 +4412,7 @@ class NewPrinterGUI(GtkGUI):
_('Searching for drivers'))
self.WaitWindow.set_transient_for (self.NewPrinterWindow)
self.WaitWindow.show ()
@@ -2267,7 +93762,7 @@ diff -up system-config-printer-1.1.11/sy
self.busy (self.NewPrinterWindow)
# Keep the UI refreshed while we wait for the drivers
-@@ -4547,6 +4578,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4547,6 +4613,7 @@ class NewPrinterGUI(GtkGUI):
parent = self.mainapp.PrintersWindow
self.WaitWindow.set_transient_for (parent)
self.WaitWindow.show_now ()
@@ -2275,7 +93770,7 @@ diff -up system-config-printer-1.1.11/sy
while gtk.events_pending ():
gtk.main_iteration ()
-@@ -4629,7 +4661,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4629,7 +4696,7 @@ class NewPrinterGUI(GtkGUI):
return True # assume plugin not required
# Check whether the plugin is already installed
if hplip_version.startswith("3"):
@@ -2284,7 +93779,7 @@ diff -up system-config-printer-1.1.11/sy
cmd = 'LC_ALL=C hp-mkuri -c'
debugprint (uri + ": " + hpmodel)
try:
-@@ -5397,22 +5429,36 @@ class NewPrinterGUI(GtkGUI):
+@@ -5397,22 +5464,36 @@ class NewPrinterGUI(GtkGUI):
verified = False
if hostport != None:
(host, port) = urllib.splitnport (hostport, defport=631)
@@ -2329,7 +93824,7 @@ diff -up system-config-printer-1.1.11/sy
else:
debugprint (uri)
-@@ -5733,6 +5779,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -5733,6 +5814,7 @@ class NewPrinterGUI(GtkGUI):
_('Searching for printers'))
self.WaitWindow.set_transient_for (self.NewPrinterWindow)
self.WaitWindow.show_now ()
@@ -2337,7 +93832,7 @@ diff -up system-config-printer-1.1.11/sy
printers = server.probe()
self.WaitWindow.hide ()
-@@ -6131,14 +6178,26 @@ class NewPrinterGUI(GtkGUI):
+@@ -6131,14 +6213,26 @@ class NewPrinterGUI(GtkGUI):
model.append((driver, ))
self.tvNPDrivers.columns_autosize()
@@ -2368,7 +93863,7 @@ diff -up system-config-printer-1.1.11/sy
path, column = widget.get_cursor()
diff -up system-config-printer-1.1.11/timedops.py.scp-git system-config-printer-1.1.11/timedops.py
--- system-config-printer-1.1.11/timedops.py.scp-git 2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/timedops.py 2009-08-19 17:51:49.150700369 +0100
++++ system-config-printer-1.1.11/timedops.py 2009-08-20 17:50:58.376798597 +0100
@@ -32,7 +32,7 @@ class Timed:
pass
@@ -2394,7 +93889,7 @@ diff -up system-config-printer-1.1.11/ti
+ return False
diff -up system-config-printer-1.1.11/ToolbarSearchEntry.py.scp-git system-config-printer-1.1.11/ToolbarSearchEntry.py
--- system-config-printer-1.1.11/ToolbarSearchEntry.py.scp-git 2009-07-21 15:10:03.000000000 +0100
-+++ system-config-printer-1.1.11/ToolbarSearchEntry.py 2009-08-19 17:51:49.108701241 +0100
++++ system-config-printer-1.1.11/ToolbarSearchEntry.py 2009-08-20 17:50:51.383792212 +0100
@@ -68,7 +68,7 @@ class ToolbarSearchEntry (gtk.HBox):
label = gtk.Label ()
label.set_text_with_mnemonic (_("_Filter:"))
@@ -2406,7 +93901,7 @@ diff -up system-config-printer-1.1.11/To
if gtk.__dict__.has_key ('ENTRY_ICON_PRIMARY'):
diff -up system-config-printer-1.1.11/udev/udev-configure-printer.c.scp-git system-config-printer-1.1.11/udev/udev-configure-printer.c
--- system-config-printer-1.1.11/udev/udev-configure-printer.c.scp-git 2009-08-07 17:42:55.000000000 +0100
-+++ system-config-printer-1.1.11/udev/udev-configure-printer.c 2009-08-19 17:51:49.153701536 +0100
++++ system-config-printer-1.1.11/udev/udev-configure-printer.c 2009-08-20 17:50:58.379792683 +0100
@@ -791,8 +791,8 @@ find_matching_device_uris (struct device
/* Now check the manufacturer and model names. */
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- system-config-printer.spec 19 Aug 2009 17:05:16 -0000 1.281
+++ system-config-printer.spec 20 Aug 2009 17:21:19 -0000 1.282
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.11
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -76,7 +76,7 @@ printers.
%prep
%setup -q -a 1 -a 2
-# Applied patch from 1.1.x (3f45e96).
+# Applied patch from 1.1.x (52a73b6).
%patch1 -p1 -b .scp-git
aclocal
automake --copy --add-missing
@@ -192,6 +192,14 @@ rm -rf %buildroot
exit 0
%changelog
+* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-6
+- Applied patch from 1.1.x (52a73b6).
+ - Better printer icons representing status (bug #518020).
+ - Use paused ico nwhen printer state reason is 'paused'.
+ - Job status icon and state reason in jobs treeview (bug #518070).
+ - Job creation times display fixes.
+ - Use preferred object path for AuthenticationAgent (bug #518427).
+
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-5
- Applied patch from 1.1.x (3f45e96):
- Show a 'paused' emblem for rejecting/disabled printers
- Previous message (by thread): rpms/sys_basher/EL-5 import.log, NONE, 1.1 sys_basher.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/openssl/devel openssl-1.0.0-beta3-fips.patch,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list