Hello community, here is the log from the commit of package system-config-printer checked in at Tue Oct 28 07:34:23 CET 2008. -------- --- GNOME/system-config-printer/system-config-printer.changes 2008-10-27 15:41:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/system-config-printer/system-config-printer.changes 2008-10-28 03:30:33.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 28 03:10:10 CET 2008 - vuntz@novell.com + +- Add system-config-printer-prefill-name-descr.patch to prefill + name and description of new printers. Fix bnc#433633. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- system-config-printer-prefill-name-descr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer.spec ++++++ --- /var/tmp/diff_new_pack.z10421/_old 2008-10-28 07:30:15.000000000 +0100 +++ /var/tmp/diff_new_pack.z10421/_new 2008-10-28 07:30:15.000000000 +0100 @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Hardware/Printing Version: 1.0.8 -Release: 3 +Release: 4 %define pycups_version 1.9.42 %define pysmbc_version 1.0.5 %define cups_pk_helper_version 0.0.1 @@ -52,6 +52,8 @@ Patch17: system-config-printer-hide-my-default-printer.patch # PATCH-FIX-OPENSUSE cups-pk-helper-acceptjobs.patch vuntz@novell.com -- Make cups-pk-helper correctly handle AcceptJobs requests. Patch18: cups-pk-helper-acceptjobs.patch +# PATCH-FIX-UPSTREAM system-config-printer-prefill-name-descr.patch bnc433633 vuntz@novell.com -- Prefill the name and description of a new printer +Patch19: system-config-printer-prefill-name-descr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: gnome-cups-manager <= 0.33 # For cups-pk-helper: @@ -112,6 +114,7 @@ pushd cups-pk-helper-%{cups_pk_helper_version} %patch18 -p1 popd +%patch19 -p1 %build autoreconf -f -i @@ -184,6 +187,9 @@ %files lang -f %{name}.lang %changelog +* Tue Oct 28 2008 vuntz@novell.com +- Add system-config-printer-prefill-name-descr.patch to prefill + name and description of new printers. Fix bnc#433633. * Mon Oct 27 2008 vuntz@novell.com - Add cups-pk-helper-acceptjobs.patch to make cups-pk-helper correctly handle AcceptJobs requests. This is essential to have ++++++ system-config-printer-prefill-name-descr.patch ++++++ diff --git a/system-config-printer.py b/system-config-printer.py index 9b5830e..e509d8b 100755 --- a/system-config-printer.py +++ b/system-config-printer.py @@ -3410,9 +3410,12 @@ class NewPrinterGUI(GtkGUI): if step > 0 and next_page_nr == 0: # About to choose a name. # Suggest an appropriate name. name = None + descr = None + try: - if self.device.id: + if self.device.id and not self.device.type in ("socket", "lpd", "ipp", "bluetooth"): name = self.device.id_dict["MDL"] + descr = "%s %s" % (self.device.id_dict["MFG"], self.device.id_dict["MDL"]) except: nonfatalException () @@ -3421,6 +3424,7 @@ class NewPrinterGUI(GtkGUI): mname = self.ppd.findAttr ("modelName").value make, model = cupshelpers.ppds.ppdMakeModelSplit (mname) name = "%s %s" % (make, model) + descr = "%s %s" % (make, model) except: nonfatalException () @@ -3430,6 +3434,9 @@ class NewPrinterGUI(GtkGUI): name = self.mainapp.makeNameUnique (name) self.entNPName.set_text (name) + if self.entNPDescription.get_text () == '' and descr: + self.entNPDescription.set_text (descr) + self.ntbkNewPrinter.set_current_page(next_page_nr) self.setNPButtons() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org