Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-09-16 00:36:58 (GMT)
committer Daniel Drake <dsd@laptop.org>2011-11-16 15:21:22 (GMT)
commitb1edd241b928b4a681ca3b2bfd6fc30feeffa426 (patch)
tree41a60c22f4553c357b6b750138f829013f5a842e /data
parent88a7c9f60c5530934623f57feb7d39d9e60e3d4f (diff)
Simple NetworkManager-0.9 port
Adapt sugar to NetworkManager-0.9 API changes. The major change here is the removal of the user-level connections mechanism; instead of storing connection information in Sugar, NetworkManager now Manages our Networks for us. However, some level of interfacing/monitoring NM is now needed, implemented with the Connections and Connection classes in jarabe.model.network. If found, connections in sugar's connections.cfg are automatically migrated, and then connections.cfg is deleted. Similarly, if modem connection details are found in gconf, they are migrated into NM and then the gconf keys are unset. The existing network code is far from perfect and actually quite messy. In this port I've tried not to make fundamental changes to improve this, in order to keep task complexity down and aid review. In the medium term I do plan to improve this code, by moving it to use gobject-introspection on libnm, and rewriting/restructuring at the same time. By letting libnm do most of the work for us, this layer can be greatly simplified. However, libnm and gobject-introspection improvements are needed first, which I will continue to work on. Modem PUK configuration has been removed as NetworkManager no longer has configuration for this. It hasn't been used (and was marked deprecated) throughout the NM-0.8 release series.
Diffstat (limited to 'data')
-rw-r--r--data/sugar.schemas.in24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index 8b3e1ad..aaef381 100644
--- a/data/sugar.schemas.in
+++ b/data/sugar.schemas.in
@@ -280,8 +280,8 @@
<type>string</type>
<default></default>
<locale name="C">
- <short>GSM network username</short>
- <long>GSM network username configuration</long>
+ <short>GSM network username (DEPRECATED/UNUSED)</short>
+ <long>GSM network username configuration (DEPRECATED/UNUSED)</long>
</locale>
</schema>
<schema>
@@ -291,8 +291,8 @@
<type>string</type>
<default></default>
<locale name="C">
- <short>GSM network password</short>
- <long>GSM network password configuration</long>
+ <short>GSM network password (DEPRECATED/UNUSED)</short>
+ <long>GSM network password configuration (DEPRECATED/UNUSED)</long>
</locale>
</schema>
<schema>
@@ -302,8 +302,8 @@
<type>string</type>
<default>*99#</default>
<locale name="C">
- <short>GSM network number</short>
- <long>GSM network telephone number configuration</long>
+ <short>GSM network number (DEPRECATED/UNUSED)</short>
+ <long>GSM network telephone number configuration (DEPRECATED/UNUSED)</long>
</locale>
</schema>
<schema>
@@ -313,8 +313,8 @@
<type>string</type>
<default></default>
<locale name="C">
- <short>GSM network APN</short>
- <long>GSM network access point name configuration</long>
+ <short>GSM network APN (DEPRECATED/UNUSED)</short>
+ <long>GSM network access point name configuration (DEPRECATED/UNUSED)</long>
</locale>
</schema>
<schema>
@@ -324,8 +324,8 @@
<type>string</type>
<default></default>
<locale name="C">
- <short>GSM network PIN</short>
- <long>GSM network personal identification number configuration</long>
+ <short>GSM network PIN (DEPRECATED/UNUSED)</short>
+ <long>GSM network personal identification number configuration (DEPRECATED/UNUSED)</long>
</locale>
</schema>
<schema>
@@ -335,8 +335,8 @@
<type>string</type>
<default></default>
<locale name="C">
- <short>GSM network PUK</short>
- <long>GSM network personal unlock key configuration</long>
+ <short>GSM network PUK (DEPRECATED/UNUSED)</short>
+ <long>GSM network personal unlock key configuration (DEPRECATED/UNUSED)</long>
</locale>
</schema>