1 | From bece52a8a7b3d0b0cd1a64aeb256a18b3caea810 Mon Sep 17 00:00:00 2001 |
---|
2 | From: tch <mabente@paraguayeduca.org> |
---|
3 | Date: Wed, 24 Feb 2010 12:00:35 -0300 |
---|
4 | Subject: [PATCH] GSM network configuration path fix |
---|
5 | |
---|
6 | --- |
---|
7 | data/sugar.schemas.in | 67 +++++++++++++++++++++++++++++++++++++++++++ |
---|
8 | src/jarabe/model/network.py | 12 ++++---- |
---|
9 | 2 files changed, 73 insertions(+), 6 deletions(-) |
---|
10 | |
---|
11 | diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in |
---|
12 | index 23a8841..e35997c 100644 |
---|
13 | --- a/data/sugar.schemas.in |
---|
14 | +++ b/data/sugar.schemas.in |
---|
15 | @@ -262,5 +262,72 @@ |
---|
16 | </locale> |
---|
17 | </schema> |
---|
18 | |
---|
19 | + <schema> |
---|
20 | + <key>/schemas/desktop/sugar/network/gsm/username</key> |
---|
21 | + <applyto>/desktop/sugar/network/gsm/username</applyto> |
---|
22 | + <owner>sugar</owner> |
---|
23 | + <type>string</type> |
---|
24 | + <default></default> |
---|
25 | + <locale name="C"> |
---|
26 | + <short>GSM network username</short> |
---|
27 | + <long>GSM network username configuration</long> |
---|
28 | + </locale> |
---|
29 | + </schema> |
---|
30 | + <schema> |
---|
31 | + <key>/schemas/desktop/sugar/network/gsm/password</key> |
---|
32 | + <applyto>/desktop/sugar/network/gsm/password</applyto> |
---|
33 | + <owner>sugar</owner> |
---|
34 | + <type>string</type> |
---|
35 | + <default></default> |
---|
36 | + <locale name="C"> |
---|
37 | + <short>GSM network password</short> |
---|
38 | + <long>GSM network password configuration</long> |
---|
39 | + </locale> |
---|
40 | + </schema> |
---|
41 | + <schema> |
---|
42 | + <key>/schemas/desktop/sugar/network/gsm/number</key> |
---|
43 | + <applyto>/desktop/sugar/network/gsm/number</applyto> |
---|
44 | + <owner>sugar</owner> |
---|
45 | + <type>string</type> |
---|
46 | + <default>*99#</default> |
---|
47 | + <locale name="C"> |
---|
48 | + <short>GSM network number</short> |
---|
49 | + <long>GSM network telephone number configuration</long> |
---|
50 | + </locale> |
---|
51 | + </schema> |
---|
52 | + <schema> |
---|
53 | + <key>/schemas/desktop/sugar/network/gsm/apn</key> |
---|
54 | + <applyto>/desktop/sugar/network/gsm/apn</applyto> |
---|
55 | + <owner>sugar</owner> |
---|
56 | + <type>string</type> |
---|
57 | + <default></default> |
---|
58 | + <locale name="C"> |
---|
59 | + <short>GSM network APN</short> |
---|
60 | + <long>GSM network access point name configuration</long> |
---|
61 | + </locale> |
---|
62 | + </schema> |
---|
63 | + <schema> |
---|
64 | + <key>/schemas/desktop/sugar/network/gsm/pin</key> |
---|
65 | + <applyto>/desktop/sugar/network/gsm/pin</applyto> |
---|
66 | + <owner>sugar</owner> |
---|
67 | + <type>string</type> |
---|
68 | + <default></default> |
---|
69 | + <locale name="C"> |
---|
70 | + <short>GSM network PIN</short> |
---|
71 | + <long>GSM network personal identification number configuration</long> |
---|
72 | + </locale> |
---|
73 | + </schema> |
---|
74 | + <schema> |
---|
75 | + <key>/schemas/desktop/sugar/network/gsm/puk</key> |
---|
76 | + <applyto>/desktop/sugar/network/gsm/puk</applyto> |
---|
77 | + <owner>sugar</owner> |
---|
78 | + <type>string</type> |
---|
79 | + <default></default> |
---|
80 | + <locale name="C"> |
---|
81 | + <short>GSM network PUK</short> |
---|
82 | + <long>GSM network personal unlock key configuration</long> |
---|
83 | + </locale> |
---|
84 | + </schema> |
---|
85 | + |
---|
86 | </schemalist> |
---|
87 | </gconfschemafile> |
---|
88 | diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py |
---|
89 | index f3a1fc6..0743d0f 100644 |
---|
90 | --- a/src/jarabe/model/network.py |
---|
91 | +++ b/src/jarabe/model/network.py |
---|
92 | @@ -89,12 +89,12 @@ NM_CONNECTION_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection' |
---|
93 | NM_SECRETS_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection.Secrets' |
---|
94 | NM_ACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint' |
---|
95 | |
---|
96 | -GSM_USERNAME_PATH = '/sugar/network/gsm/username' |
---|
97 | -GSM_PASSWORD_PATH = '/sugar/network/gsm/password' |
---|
98 | -GSM_NUMBER_PATH = '/sugar/network/gsm/number' |
---|
99 | -GSM_APN_PATH = '/sugar/network/gsm/apn' |
---|
100 | -GSM_PIN_PATH = '/sugar/network/gsm/pin' |
---|
101 | -GSM_PUK_PATH = '/sugar/network/gsm/puk' |
---|
102 | +GSM_USERNAME_PATH = '/desktop/sugar/network/gsm/username' |
---|
103 | +GSM_PASSWORD_PATH = '/desktop/sugar/network/gsm/password' |
---|
104 | +GSM_NUMBER_PATH = '/desktop/sugar/network/gsm/number' |
---|
105 | +GSM_APN_PATH = '/desktop/sugar/network/gsm/apn' |
---|
106 | +GSM_PIN_PATH = '/desktop/sugar/network/gsm/pin' |
---|
107 | +GSM_PUK_PATH = '/desktop/sugar/network/gsm/puk' |
---|
108 | |
---|
109 | _nm_settings = None |
---|
110 | _conn_counter = 0 |
---|
111 | -- |
---|
112 | 1.6.0.4 |
---|
113 | |
---|