diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-02-05 00:21:55 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-02-05 00:21:55 (GMT) |
commit | 44efc2a1315efe90eb2edc7a24b1372382222408 (patch) | |
tree | 565b8baf5cace68ec0462077506012e04c8ad108 /src/view/frame | |
parent | aca3ae6c88eb56b4dd2f818928ecca5064669978 (diff) |
Complete paths cleanup and remove SUGAR_PREFIX and
SUGAR_PATH environment variables.
Diffstat (limited to 'src/view/frame')
-rw-r--r-- | src/view/frame/activitiestray.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/view/frame/activitiestray.py b/src/view/frame/activitiestray.py index 3dbf955..11e812c 100644 --- a/src/view/frame/activitiestray.py +++ b/src/view/frame/activitiestray.py @@ -14,9 +14,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import hippo +import os import logging +import hippo + from sugar.graphics.tray import TrayButton from sugar.graphics.tray import HTray from sugar.graphics.icon import Icon @@ -26,6 +28,7 @@ from sugar import activity from sugar import env from activitybutton import ActivityButton +import config class InviteButton(TrayButton): def __init__(self, activity_model, invite): @@ -73,16 +76,16 @@ class ActivitiesTray(hippo.CanvasBox): self._invites.connect('invite-removed', self._invite_removed_cb) def _load_config(self): - config = [] + cfg = [] - f = open(env.get_data_path('activities.defaults'), 'r') + f = open(os.path.join(config.data_path, 'activities.defaults'), 'r') for line in f.readlines(): line = line.strip() if line and not line.startswith('#'): - config.append(line) + cfg.append(line) f.close() - return config + return cfg def _get_activities_cb(self, activity_list): known_activities = [] |