diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-11-15 18:29:07 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2011-12-13 20:19:52 (GMT) |
| commit | 820efa56b9876bb418bc51d30de959775930e35c (patch) | |
| tree | a4310912a6a3f067c128ff1b3d47a47b5f3de5ac /src/sugar3/profile.py | |
| parent | aed295ec4effbee66626da7ff42277f691ddb5bd (diff) | |
Run pygi-convert.sh for automatic conversion from GTK2 to GTK3 + pygi.
This is only on a best-effort basis; the code will be in a broken state after
this patch and need to be fixed manually.
The purpose of committing the intermediate, non-working output is to make it
reproducible. It's impractical to manually review the changes.
The exact version used was 4f637212f13b197a95c824967a58496b9e3b877c from the
main pygobject repository [1] plus a custom patch [2] that hasn't been sent
upstream yet.
[1] git://git.gnome.org/pygobject
[2] https://sascha.silbe.org/patches/pygobject-convert-sugar-20111122.patch
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Diffstat (limited to 'src/sugar3/profile.py')
| -rw-r--r-- | src/sugar3/profile.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sugar3/profile.py b/src/sugar3/profile.py index 172d2ad..7482da6 100644 --- a/src/sugar3/profile.py +++ b/src/sugar3/profile.py @@ -20,7 +20,7 @@ DEPRECATED. We are using GConf now to store preferences. """ -import gconf +from gi.repository import GConf import os import logging from ConfigParser import ConfigParser @@ -68,7 +68,7 @@ class Profile(object): privkey_hash = property(fget=_get_privkey_hash) def is_valid(self): - client = gconf.client_get_default() + client = GConf.Client.get_default() nick = client.get_string('/desktop/sugar/user/nick') color = client.get_string('/desktop/sugar/user/color') @@ -140,7 +140,7 @@ class Profile(object): path = os.path.join(env.get_profile_path(), 'config') cp.read([path]) - client = gconf.client_get_default() + client = GConf.Client.get_default() if cp.has_option('Buddy', 'NickName'): name = cp.get('Buddy', 'NickName') @@ -224,12 +224,12 @@ def get_profile(): def get_nick_name(): - client = gconf.client_get_default() + client = GConf.Client.get_default() return client.get_string('/desktop/sugar/user/nick') def get_color(): - client = gconf.client_get_default() + client = GConf.Client.get_default() color = client.get_string('/desktop/sugar/user/color') return XoColor(color) |