rpms/system-config-printer/F-12 system-config-printer-notification-timeouts.patch, NONE, 1.1 system-config-printer.spec, 1.334, 1.335

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-notification-timeouts.patch 
Log Message:
* Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
- Set notification timeouts appropriately (bug #550829).


system-config-printer-notification-timeouts.patch:
 applet.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-notification-timeouts.patch ---
diff -up system-config-printer-1.1.16/applet.py.notification-timeouts system-config-printer-1.1.16/applet.py
--- system-config-printer-1.1.16/applet.py.notification-timeouts	2009-12-22 14:44:19.000000000 +0000
+++ system-config-printer-1.1.16/applet.py	2010-01-06 15:43:24.219409075 +0000
@@ -126,6 +126,7 @@ class NewPrinterNotification(dbus.servic
             n = pynotify.Notification (title, text, 'printer')
             if "actions" in pynotify.get_server_caps():
                 n.set_urgency (pynotify.URGENCY_CRITICAL)
+                n.set_timeout (pynotify.EXPIRES_NEVER)
                 n.add_action ("setup-printer", _("Search"),
                               lambda x, y:
                                   self.setup_printer (x, y, name, devid))
@@ -182,6 +183,7 @@ class NewPrinterNotification(dbus.servic
                 if "actions" in pynotify.get_server_caps():
                     try:
                         self.packagekit = installpackage.PackageKit ()
+                        n.set_timeout (pynotify.EXPIRES_NEVER)
                         n.add_action ("install-driver", _("Install"),
                                       lambda x, y:
                                           self.install_driver (x, y,


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- system-config-printer.spec	6 Jan 2010 15:43:09 -0000	1.334
+++ system-config-printer.spec	6 Jan 2010 15:47:05 -0000	1.335
@@ -21,6 +21,7 @@ Patch3: system-config-printer-driver-pre
 Patch4: system-config-printer-foomatic-recommended.patch
 Patch5: system-config-printer-jobviewer-exit.patch
 Patch6: system-config-printer-npinit-traceback.patch
+Patch7: system-config-printer-notification-timeouts.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -86,6 +87,7 @@ printers.
 %patch4 -p1 -b .foomatic-recommended
 %patch5 -p1 -b .jobviewer-exit
 %patch6 -p1 -b .npinit-traceback
+%patch7 -p1 -b .notification-timeouts
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -203,6 +205,7 @@ exit 0
 
 %changelog
 * Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
+- Set notification timeouts appropriately (bug #550829).
 - Avoid traceback in NewPrinterGUI.init (bug #550442).
 - Avoid traceback in on_jobviewer_exit (bug #550437).