Ticket #1739: 0001-GSM-network-configuration-path-fix.patch

File 0001-GSM-network-configuration-path-fix.patch, 3.8 KB (added by tch, 14 years ago)

  • data/sugar.schemas.in 

    From 523d9715e23659f88eb4e14071ba6d4e0ad16895 Mon Sep 17 00:00:00 2001
From: tch <mabente@paraguayeduca.org>
Date: Mon, 22 Feb 2010 16:29:49 -0300
Subject: [PATCH] GSM network configuration path fix

---
 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..c2ba684 100644
    a b  
    262262      </locale>
    263263    </schema>
    264264
     265    <schema>
     266      <key>/schemas/desktop/network/gsm/username</key>
     267      <applyto>/desktop/network/gsm/username</applyto>
     268      <owner>sugar</owner>
     269      <type>string</type>
     270      <default></default>
     271      <locale name="C">
     272        <short>GSM network username</short>
     273        <long>GSM network username configuration</long>
     274      </locale>
     275    </schema>
     276    <schema>
     277      <key>/schemas/desktop/network/gsm/password</key>
     278      <applyto>/desktop/network/gsm/password</applyto>
     279      <owner>sugar</owner>
     280      <type>string</type>
     281      <default></default>
     282      <locale name="C">
     283        <short>GSM network password</short>
     284        <long>GSM network password configuration</long>
     285      </locale>
     286    </schema>
     287    <schema>
     288      <key>/schemas/desktop/network/gsm/number</key>
     289      <applyto>/desktop/network/gsm/number</applyto>
     290      <owner>sugar</owner>
     291      <type>string</type>
     292      <default>*99#</default>
     293      <locale name="C">
     294        <short>GSM network number</short>
     295        <long>GSM network telephone number configuration</long>
     296      </locale>
     297    </schema>
     298    <schema>
     299      <key>/schemas/desktop/network/gsm/apn</key>
     300      <applyto>/desktop/network/gsm/apn</applyto>
     301      <owner>sugar</owner>
     302      <type>string</type>
     303      <default></default>
     304      <locale name="C">
     305        <short>GSM network apn</short>
     306        <long>GSM network access point name configuration</long>
     307      </locale>
     308    </schema>
     309    <schema>
     310      <key>/schemas/desktop/network/gsm/pin</key>
     311      <applyto>/desktop/network/gsm/pin</applyto>
     312      <owner>sugar</owner>
     313      <type>string</type>
     314      <default></default>
     315      <locale name="C">
     316        <short>GSM network pin</short>
     317        <long>GSM network personal identification number configuration</long>
     318      </locale>
     319    </schema>
     320    <schema>
     321      <key>/schemas/desktop/network/gsm/puk</key>
     322      <applyto>/desktop/network/gsm/puk</applyto>
     323      <owner>sugar</owner>
     324      <type>string</type>
     325      <default></default>
     326      <locale name="C">
     327        <short>GSM network puk</short>
     328        <long>GSM network personal unlock key configuration</long>
     329      </locale>
     330    </schema>
     331
    265332  </schemalist>
    266333</gconfschemafile>

  • src/jarabe/model/network.py 

    diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index f3a1fc6..9714ee7 100644
    a b NM_CONNECTION_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection' 
    8989NM_SECRETS_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection.Secrets'
    9090NM_ACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint'
    9191
    92 GSM_USERNAME_PATH = '/sugar/network/gsm/username'
    93 GSM_PASSWORD_PATH = '/sugar/network/gsm/password'
    94 GSM_NUMBER_PATH = '/sugar/network/gsm/number'
    95 GSM_APN_PATH = '/sugar/network/gsm/apn'
    96 GSM_PIN_PATH = '/sugar/network/gsm/pin'
    97 GSM_PUK_PATH = '/sugar/network/gsm/puk'
     92GSM_USERNAME_PATH = '/desktop/network/gsm/username'
     93GSM_PASSWORD_PATH = '/desktop/network/gsm/password'
     94GSM_NUMBER_PATH = '/desktop/network/gsm/number'
     95GSM_APN_PATH = '/desktop/network/gsm/apn'
     96GSM_PIN_PATH = '/desktop/network/gsm/pin'
     97GSM_PUK_PATH = '/desktop/network/gsm/puk'
    9898
    9999_nm_settings = None
    100100_conn_counter = 0