rpms/system-config-printer/F-10 system-config-printer-older-gtk.patch, NONE, 1.1 system-config-printer.spec, 1.247, 1.248

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19166

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-older-gtk.patch 
Log Message:
* Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
- Fixed crash on start-up.


system-config-printer-older-gtk.patch:
 ToolbarSearchEntry.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-older-gtk.patch ---
diff -up system-config-printer-1.1.12/ToolbarSearchEntry.py.older-gtk system-config-printer-1.1.12/ToolbarSearchEntry.py
--- system-config-printer-1.1.12/ToolbarSearchEntry.py.older-gtk	2009-08-25 15:01:40.000000000 +0100
+++ system-config-printer-1.1.12/ToolbarSearchEntry.py	2009-08-27 16:42:58.069400058 +0100
@@ -80,6 +80,7 @@ class ToolbarSearchEntry (gtk.HBox):
 
             self.entry.set_icon_sensitive (gtk.ENTRY_ICON_SECONDARY, False)
             self.entry.set_icon_activatable (gtk.ENTRY_ICON_SECONDARY, False)
+            self.entry.connect ('icon-press', self.on_icon_press)
 
         label.set_mnemonic_widget (self.entry)
 
@@ -88,7 +89,6 @@ class ToolbarSearchEntry (gtk.HBox):
         self.entry.connect ('changed', self.on_changed)
         self.entry.connect ('focus_out_event', self.on_focus_out_event)
         self.entry.connect ('activate', self.on_activate)
-        self.entry.connect ('icon-press', self.on_icon_press)
 
     def do_get_property (self, property):
         if property.name == 'search_timeout':


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- system-config-printer.spec	26 Aug 2009 16:54:05 -0000	1.247
+++ system-config-printer.spec	27 Aug 2009 15:45:43 -0000	1.248
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-get_cursor.patch
 Patch2: system-config-printer-statereason-icons.patch
 Patch3: system-config-printer-icon-load-traceback.patch
+Patch4: system-config-printer-older-gtk.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -68,6 +69,7 @@ the configuration tool.
 %patch1 -p1 -b .get_cursor
 %patch2 -p1 -b .statereason-icons
 %patch3 -p1 -b .icon-load-traceback
+%patch4 -p1 -b .older-gtk
 
 %build
 %configure
@@ -169,6 +171,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Aug 27 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-5
+- Fixed crash on start-up.
+
 * Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1.1.12-4
 - Handle icon load failure gracefully.
 - Fixed statereason icon names.