Merge branch 'f14'

This commit is contained in:
Tim Waugh 2010-12-02 16:26:57 +00:00
commit bae429eb8d
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,11 @@
diff -up system-config-printer-1.2.5/system-config-printer.py.compiz-rename system-config-printer-1.2.5/system-config-printer.py
--- system-config-printer-1.2.5/system-config-printer.py.compiz-rename 2010-12-02 16:15:00.656238304 +0000
+++ system-config-printer-1.2.5/system-config-printer.py 2010-12-02 16:15:13.265702866 +0000
@@ -3076,6 +3076,7 @@ class GUI(GtkGUI, monitor.Watcher):
ids.append (cell.connect ('editing-canceled',
self.printer_name_edit_cancel))
self.rename_sigids = ids
+ self.dests_iconview.grab_focus ()
def printer_name_edited (self, cell, path, newname):
newname = newname.replace("/", "")

View File

@ -5,12 +5,13 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.2.95 Version: 1.2.95
Release: 3%{?dist} Release: 4%{?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/1.2/%{name}-%{version}.tar.xz Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{version}.tar.xz
Patch1: system-config-printer-attach-to-status-icon.patch Patch1: system-config-printer-attach-to-status-icon.patch
Patch2: system-config-printer-compiz-rename.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gettext-devel BuildRequires: gettext-devel
@ -67,6 +68,7 @@ printers.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .attach-to-status-icon %patch1 -p1 -b .attach-to-status-icon
%patch2 -p1 -b .compiz-rename
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -176,6 +178,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Thu Dec 2 2010 Tim Waugh <twaugh@redhat.com> - 1.2.95-4
- Grab focus on the IconView after setting it editable (bug #650995).
* Tue Nov 30 2010 Tim Waugh <twaugh@redhat.com> - 1.2.95-3 * Tue Nov 30 2010 Tim Waugh <twaugh@redhat.com> - 1.2.95-3
- Removed calls to pynotify.Notification.attach_to_status_icon() - Removed calls to pynotify.Notification.attach_to_status_icon()
(bug #657722). (bug #657722).