diff options
author | Sayamindu Dasgupta <sayamindu@gmail.com> | 2010-05-10 13:42:43 (GMT) |
---|---|---|
committer | Sayamindu Dasgupta <sayamindu@gmail.com> | 2010-05-10 13:42:43 (GMT) |
commit | 5b651f7bf3c3877fe1fdf61e26a10115928f2818 (patch) | |
tree | 4eda374034d7a75a9a56a483cd9da60ef0cef3b1 /src | |
parent | 027676174d3e0f287e64257841ada3e9635ac6b6 (diff) |
Pin Puk Configuration
Diffstat (limited to 'src')
-rw-r--r-- | src/jarabe/model/network.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index d0d3112..6d5a547 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -91,6 +91,8 @@ GSM_USERNAME_PATH = '/sugar/network/gsm/username' GSM_PASSWORD_PATH = '/sugar/network/gsm/password' GSM_NUMBER_PATH = '/sugar/network/gsm/number' GSM_APN_PATH = '/sugar/network/gsm/apn' +GSM_PIN_PATH = '/sugar/network/gsm/pin' +GSM_PUK_PATH = '/sugar/network/gsm/puk' _nm_settings = None _conn_counter = 0 @@ -261,11 +263,17 @@ class SettingsGsm(object): class SecretsGsm(object): def __init__(self): self.password = None - + self.pin = None + self.puk = None + def get_dict(self): secrets = {} if self.password is not None: secrets['password'] = self.password + if self.pin is not None: + secrets['pin'] = self.pin + if self.puk is not None: + secrets['puk'] = self.puk return {'gsm': secrets} class NMSettings(dbus.service.Object): @@ -657,17 +665,17 @@ def clear_connections(): f.close() def load_gsm_connection(): - settings = SettingsGsm() - secrets = SecretsGsm() - client = gconf.client_get_default() + + settings = SettingsGsm() settings.gsm.username = client.get_string(GSM_USERNAME_PATH) or '' settings.gsm.number = client.get_string(GSM_NUMBER_PATH) or '' settings.gsm.apn = client.get_string(GSM_APN_PATH) or '' - password = client.get_string(GSM_PASSWORD_PATH) or '' - if password: - secrets.password = password + secrets = SecretsGsm() + secrets.pin = client.get_string(GSM_PIN_PATH) or '' + secrets.puk = client.get_string(GSM_PUK_PATH) or '' + secrets.password = client.get_string(GSM_PASSWORD_PATH) or '' settings.connection.id = 'gsm' settings.connection.type = NM_CONNECTION_TYPE_GSM |