jhbuild r2020 - in trunk: . jhbuild/utils

[mccann svn gnome org]

Author: mccann
Date: Mon Apr 14 17:57:12 2008
New Revision: 2020
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2020&view=rev

Log:
2008-04-14  William Jon McCann  <jmccann redhat com>

	* jhbuild/utils/trayicon.py: Signal zenity when shutting down.
	Fixes #526745



Modified:
   trunk/ChangeLog
   trunk/jhbuild/utils/trayicon.py

Modified: trunk/jhbuild/utils/trayicon.py
==============================================================================
--- trunk/jhbuild/utils/trayicon.py	(original)
+++ trunk/jhbuild/utils/trayicon.py	Mon Apr 14 17:57:12 2008
@@ -20,6 +20,7 @@
 import sys
 import os
 import subprocess
+import signal
 
 class TrayIcon:
     proc = None
@@ -29,6 +30,10 @@
             return
         self._run_zenity()
 
+    def __del__(self):
+        if self.proc:
+            self.close()
+
     def _run_zenity(self):
         # run zenity with stdout and stderr directed to /dev/null
         def preexec():
@@ -52,6 +57,7 @@
         status = None
         if self.proc:
             self.proc.stdin.close()
+            os.kill(self.proc.pid, signal.SIGTERM)
             status = self.proc.wait()
             self.proc = None
         return status