Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

This commit is contained in:
Marco Pesenti Gritti 2006-11-13 01:16:56 +01:00
commit 34c61de054

View File

@ -424,7 +424,8 @@ class NMInfo(object):
# and return it to NetworkManager # and return it to NetworkManager
sec = Security.new_from_args(we_cipher, key, auth_alg) sec = Security.new_from_args(we_cipher, key, auth_alg)
props = sec.get_properties() props = sec.get_properties()
async_cb(tuple(props)) a = tuple(props)
async_cb(*a)
def cancel_get_key_for_network(self): def cancel_get_key_for_network(self):
# Tell the NMClient to close the key request dialog # Tell the NMClient to close the key request dialog