--- /usr/share/gajim/src/gajim.py.~1~	2012-05-15 08:42:40.000000000 -0500
+++ /usr/share/gajim/src/gajim.py	2012-05-15 10:35:46.000000000 -0500
@@ -475,7 +475,7 @@ class PassphraseRequest:
 
 
 class ThreadInterface:
-		def __init__(self, func, func_args, callback, callback_args):
+		def __init__(self, func, func_args=(), callback=None, callback_args=()):
 			'''Call a function in a thread
 
 			:param func: the function to call in the thread
@@ -485,7 +485,8 @@ class ThreadInterface:
 			'''
 			def thread_function(func, func_args, callback, callback_args):
 				output = func(*func_args)
-				gobject.idle_add(callback, output, *callback_args)
+				if callback:
+					gobject.idle_add(callback, output, *callback_args)
 			Thread(target=thread_function, args=(func, func_args, callback,
 				callback_args)).start()