[system-config-printer/f14] Don't handle tooltips during mainloop recursion (bug #664044).

[Tim Waugh]

commit 14a89d7815711e1432a4c69435a9415dccbc6bc2
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Sep 20 15:10:57 2011 +0100

    Don't handle tooltips during mainloop recursion (bug #664044).

 system-config-printer-tooltips.patch |   16 ++++++++++++++++
 system-config-printer.spec           |    9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/system-config-printer-tooltips.patch b/system-config-printer-tooltips.patch
new file mode 100644
index 0000000..1d29807
--- /dev/null
+++ b/system-config-printer-tooltips.patch
@@ -0,0 +1,16 @@
+diff --git a/jobviewer.py b/jobviewer.py
+index a42dd29..b87c0bd 100644
+--- a/jobviewer.py
++++ b/jobviewer.py
+@@ -1084,6 +1084,11 @@ class JobViewer (GtkGUI, monitor.Watcher):
+         debugprint ("num_jobs: %d" % num_jobs)
+         debugprint ("num_jobs_when_hidden: %d" % self.num_jobs_when_hidden)
+ 
++        # Don't handle tooltips during the mainloop recursion at the
++        # end of this function as it seems to cause havoc (bug #664044,
++        # bug #739745).
++        self.statusicon.set_has_tooltip (False)
++
+         self.statusicon.set_visible (self.special_status_icon or
+                                      open_notifications > 0 or
+                                      num_jobs > self.num_jobs_when_hidden)
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 933db09..311e654 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{versio
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 # Python bindings for libsmbclient
 Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-tooltips.patch
 Patch101: pysmbc-doczip.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -75,6 +76,9 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 
+# Don't handle tooltips during mainloop recursion (bug #664044).
+%patch1 -p1 -b .tooltips
+
 pushd pysmbc-%{pysmbc_version}
 %patch101 -p1 -b .doczip
 popd
@@ -200,6 +204,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Sep 20 2011 Tim Waugh <twaugh at redhat.com> - 1.2.8-2
+- Don't handle tooltips during mainloop recursion (bug #664044).
+
 * Tue Apr 05 2011 Tim Waugh <twaugh at redhat.com> - 1.2.8-1
 - 1.2.8:
   - Set connected state when connecting to server fails (bug #685098).