This commit is contained in:
Tim Waugh 2008-05-27 17:21:54 +00:00
parent ef133e7380
commit 501699bace
6 changed files with 9 additions and 48 deletions

View File

@ -167,3 +167,4 @@ system-config-printer-0.9.91.tar.bz2
pysmbc-1.0.2.tar.bz2 pysmbc-1.0.2.tar.bz2
system-config-printer-0.9.92.tar.bz2 system-config-printer-0.9.92.tar.bz2
system-config-printer-0.9.93.tar.bz2 system-config-printer-0.9.93.tar.bz2
system-config-printer-1.0.0.tar.bz2

View File

@ -1,3 +1,3 @@
cf3a3db3f1ff08bdf2c9254086e8ec70 pycups-1.9.38.tar.bz2 cf3a3db3f1ff08bdf2c9254086e8ec70 pycups-1.9.38.tar.bz2
5e82fb70ead0d00f2ec8979b44269982 pysmbc-1.0.2.tar.bz2 5e82fb70ead0d00f2ec8979b44269982 pysmbc-1.0.2.tar.bz2
b97deae648bc1c5825874d250a9c140c system-config-printer-0.9.93.tar.bz2 8a24d4212f97f4bbcc4b8ae55d275d1b system-config-printer-1.0.0.tar.bz2

Binary file not shown.

View File

@ -1,41 +0,0 @@
From 13c584b417496be4a99560a71bf0950cf9ec5269 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 23 May 2008 16:17:03 +0100
Subject: [PATCH] Removed Scanning... label when SMB browsing shows no workgroups.
---
ChangeLog | 4 ++++
system-config-printer.py | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9b10f43..3d7c547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-05-23 Tim Waugh <twaugh@redhat.com>
+ * system-config-printer.py
+ (NewPrinterGUI.browse_smb_hosts_thread): Remove the 'Scanning...'
+ label when browsing is unsuccessful.
+
* configure.in: Version 0.9.93.
2008-05-23 Tim Waugh <twaugh@redhat.com>
diff --git a/system-config-printer.py b/system-config-printer.py
index a793ef1..6564de8 100755
--- a/system-config-printer.py
+++ b/system-config-printer.py
@@ -3355,8 +3355,8 @@ class NewPrinterGUI(GtkGUI):
store.set_value (iter, 0, d['DOMAIN'])
store.set_value (iter, 2, d)
else:
+ store.clear ()
if workgroups:
- store.clear ()
for workgroup in workgroups:
iter = store.append (None, [workgroup])
i = store.append (iter)
--
1.5.4.3

View File

@ -5,19 +5,18 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 0.9.93 Version: 1.0.0
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/system-config-printer-%{version}.tar.bz2 Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2
Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-scanning.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
BuildRequires: libsmbclient-devel >= 2.4 BuildRequires: libsmbclient-devel >= 3.2
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: intltool BuildRequires: intltool
@ -59,7 +58,6 @@ the configuration tool.
%prep %prep
%setup -q -a 1 -a 2 %setup -q -a 1 -a 2
%patch1 -p1 -b .scanning
%build %build
%configure %configure
@ -143,6 +141,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Tue May 27 2008 Tim Waugh <twaugh@redhat.com> 1.0.0-1
- 1.0.0.
* Fri May 23 2008 Tim Waugh <twaugh@redhat.com> 0.9.93-2 * Fri May 23 2008 Tim Waugh <twaugh@redhat.com> 0.9.93-2
- Fixed small UI problem in SMB browser. - Fixed small UI problem in SMB browser.