rpms/hplip/F-12 hplip-no-system-tray.patch, NONE, 1.1 hplip.spec, 1.263, 1.264

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14851

Modified Files:
	hplip.spec 
Added Files:
	hplip-no-system-tray.patch 
Log Message:
* Tue May 11 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-9
- Wait for max 30s to see if a system tray becomes available (bug #569969).


hplip-no-system-tray.patch:
 systemtray.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hplip-no-system-tray.patch ---
diff -up hplip-3.10.2/ui4/systemtray.py.no-system-tray hplip-3.10.2/ui4/systemtray.py
--- hplip-3.10.2/ui4/systemtray.py.no-system-tray	2010-05-11 14:40:57.000000000 +0200
+++ hplip-3.10.2/ui4/systemtray.py	2010-05-11 15:25:20.000000000 +0200
@@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000
 BLIP_DELAY = 2000
 SET_MENU_DELAY = 1000
 MAX_MENU_EVENTS = 10
+TRAY_AVAILABLE_DELAY = 30
 
 ERROR_STATE_TO_ICON = {
     ERROR_STATE_CLEAR:        QSystemTrayIcon.Information,
@@ -707,7 +708,7 @@ def run(read_pipe):
     app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app
 
     i = 0
-    while i < 10:
+    while i < TRAY_AVAILABLE_DELAY:
         if QSystemTrayIcon.isSystemTrayAvailable():
             break
         time.sleep(1.0)


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- hplip.spec	28 Apr 2010 12:00:40 -0000	1.263
+++ hplip.spec	11 May 2010 13:54:46 -0000	1.264
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -29,6 +29,7 @@ Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
 Patch17: hplip-skip-blank-lines.patch
 Patch18: hplip-dbglog-newline.patch
+Patch19: hplip-no-system-tray.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -166,6 +167,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Added missing newline to string argument in dbglog() call (bug #585275).
 %patch18 -p1 -b .dbglog-newline
 
+# Wait for max 30s to see if a system tray becomes available (bug #569969).
+%patch19 -p1 -b .no-system-tray
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -386,6 +390,9 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Tue May 11 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-9
+- Wait for max 30s to see if a system tray becomes available (bug #569969).
+
 * Wed Apr 28 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-8
 - Clear old printer-state-reasons we used to manage (bug #510926).