diff --git a/services/nm/nmclient.py b/services/nm/nmclient.py index 3133c4e1..ee2b1e93 100644 --- a/services/nm/nmclient.py +++ b/services/nm/nmclient.py @@ -775,7 +775,7 @@ class NMClientApp: self._popdown() - def get_key_for_network(self, async_cb, async_err_cb, wep_auth_alg=IW_AUTH_ALG_OPEN_SYSTEM): + def get_key_for_network(self, net, async_cb, async_err_cb, wep_auth_alg=IW_AUTH_ALG_OPEN_SYSTEM): # Throw up a dialog asking for the key here, and set # the authentication algorithm to the given one, if any # diff --git a/services/nm/nminfo.py b/services/nm/nminfo.py index a03157a2..9aff0756 100644 --- a/services/nm/nminfo.py +++ b/services/nm/nminfo.py @@ -22,6 +22,7 @@ import time import os import binascii from ConfigParser import ConfigParser +import logging import nmclient try: @@ -139,7 +140,7 @@ class Security(object): new_from_args = staticmethod(new_from_args) def get_properties(self): - return [self._we_cipher] + return [dbus.Int32(self._we_cipher)] def write_to_config(self, section, config): config.set(section, "we_cipher", self._we_cipher) @@ -176,7 +177,7 @@ class WEPSecurity(Security): def get_properties(self): args = Security.get_properties(self) args.append(self._key) - args.append(self._auth_alg) + args.append(dbus.Int32(self._auth_alg)) return args def write_to_config(self, section, config): @@ -392,7 +393,7 @@ class NMInfo(object): if not net: async_err_cb(NotFoundError("Network was unknown.")) - self._nmclient.get_key_for_network(async_cb, async_err_cb, net) + self._nmclient.get_key_for_network(net, async_cb, async_err_cb) def get_key_for_network_cb(self, key, auth_alg, async_cb, async_err_cb, canceled=False): """