sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-11-13 01:07:17 +01:00
commit a317c86d6a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/nm/nmclient.py
View File

@ -775,7 +775,7 @@ class NMClientApp:
self._popdown() 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 # Throw up a dialog asking for the key here, and set
# the authentication algorithm to the given one, if any # the authentication algorithm to the given one, if any
# #

7
services/nm/nminfo.py
View File

@ -22,6 +22,7 @@ import time
import os import os
import binascii import binascii
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
import logging
import nmclient import nmclient
try: try:
@ -139,7 +140,7 @@ class Security(object):
new_from_args = staticmethod(new_from_args) new_from_args = staticmethod(new_from_args)
def get_properties(self): def get_properties(self):
return [self._we_cipher] return [dbus.Int32(self._we_cipher)]
def write_to_config(self, section, config): def write_to_config(self, section, config):
config.set(section, "we_cipher", self._we_cipher) config.set(section, "we_cipher", self._we_cipher)
@ -176,7 +177,7 @@ class WEPSecurity(Security):
def get_properties(self): def get_properties(self):
args = Security.get_properties(self) args = Security.get_properties(self)
args.append(self._key) args.append(self._key)
args.append(self._auth_alg) args.append(dbus.Int32(self._auth_alg))
return args return args
def write_to_config(self, section, config): def write_to_config(self, section, config):
@ -392,7 +393,7 @@ class NMInfo(object):
if not net: if not net:
async_err_cb(NotFoundError("Network was unknown.")) 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): def get_key_for_network_cb(self, key, auth_alg, async_cb, async_err_cb, canceled=False):
""" """