Diff

Index: src/common/GnuPG.py===================================================================--- src/common/GnuPG.py	(revision 3479)+++ src/common/GnuPG.py	(working copy)@@ -103,7 +103,10 @@ 				return str 			proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr']) 			proc.handles['stdin'].write(str)-			proc.handles['stdin'].close()+                        try:+                                proc.handles['stdin'].close()+                        except IOError:+                                pass  			output = proc.handles['stdout'].read() 			proc.handles['stdout'].close()Index: src/gajim.py===================================================================--- src/gajim.py	(revision 3479)+++ src/gajim.py	(working copy)@@ -34,7 +34,7 @@ 		print 'Gajim needs Xserver to run. Exiting...' 		sys.exit() 		-import gobject+import gobject #; gobject.threads_init() import pango import sre import signal@@ -93,6 +93,22 @@ except ImportError: 	pass +## Session Management support+try:+        import gnome.ui+except ImportError:+        print >> sys.stderr, "session management not available (missing gnome.ui module)"+else:+        def die_cb(cli):+                gtk.main_quit()+        if __name__ == '__main__':+                print "****************************************"+                gnome.program_init("gajim", gajim.version)+                cli = gnome.ui.master_client()+                cli.connect("die", die_cb)+                cli.set_restart_command(1, sys.argv[:1])+## /+ class Contact: 	'''Information concerning each contact''' 	def __init__(self, jid='', name='', groups=[], show='', status='', sub='',\