From d491e9e87da2fdcd8c522b811909670fdf9f9731 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Mon, 1 Mar 2010 17:29:30 +0100
Subject: [PATCH] 3G: Add gconf keys to the sugar gconf schema (Martin Abente)
Organization: Sugar Labs Foundation

Tracking bug was: #1739
---
 data/sugar.schemas.in       |   67 +++++++++++++++++++++++++++++++++++++++++++
 src/jarabe/model/network.py |   12 ++++----
 2 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index 23a8841..e35997c 100644
--- a/data/sugar.schemas.in
+++ b/data/sugar.schemas.in
@@ -204,5 +204,73 @@
        </locale>
      </schema>
 
+    <schema>
+      <key>/schemas/desktop/sugar/network/gsm/username</key>
+      <applyto>/desktop/sugar/network/gsm/username</applyto>
+      <owner>sugar</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>GSM network username</short>
+        <long>GSM network username configuration</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/sugar/network/gsm/password</key>
+      <applyto>/desktop/sugar/network/gsm/password</applyto>
+      <owner>sugar</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>GSM network password</short>
+        <long>GSM network password configuration</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/sugar/network/gsm/number</key>
+      <applyto>/desktop/sugar/network/gsm/number</applyto>
+      <owner>sugar</owner>
+      <type>string</type>
+      <default>*99#</default>
+      <locale name="C">
+        <short>GSM network number</short>
+        <long>GSM network telephone number configuration</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/sugar/network/gsm/apn</key>
+      <applyto>/desktop/sugar/network/gsm/apn</applyto>
+      <owner>sugar</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>GSM network APN</short>
+        <long>GSM network access point name configuration</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/sugar/network/gsm/pin</key>
+      <applyto>/desktop/sugar/network/gsm/pin</applyto>
+      <owner>sugar</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>GSM network PIN</short>
+        <long>GSM network personal identification number configuration</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/sugar/network/gsm/puk</key>
+      <applyto>/desktop/sugar/network/gsm/puk</applyto>
+      <owner>sugar</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>GSM network PUK</short>
+        <long>GSM network personal unlock key configuration</long>
+      </locale>
+    </schema>
+
+
   </schemalist>
 </gconfschemafile>
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index f3a1fc6..0743d0f 100644
--- a/src/jarabe/model/network.py
+++ b/src/jarabe/model/network.py
@@ -89,12 +89,12 @@ NM_CONNECTION_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection'
 NM_SECRETS_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection.Secrets'
 NM_ACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint'
 
-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'
+GSM_USERNAME_PATH = '/desktop/sugar/network/gsm/username'
+GSM_PASSWORD_PATH = '/desktop/sugar/network/gsm/password'
+GSM_NUMBER_PATH = '/desktop/sugar/network/gsm/number'
+GSM_APN_PATH = '/desktop/sugar/network/gsm/apn'
+GSM_PIN_PATH = '/desktop/sugar/network/gsm/pin'
+GSM_PUK_PATH = '/desktop/sugar/network/gsm/puk'
 
 _nm_settings = None
 _conn_counter = 0
-- 
1.6.6.1