From 41a5461b3129ab485709b0a556b30a1d1b878212 Mon Sep 17 00:00:00 2001
From: Raúl Gutiérrez S <rgs@paraguayeduca.org>
Date: Sat, 05 Dec 2009 14:40:25 +0000
Subject: refactoring datapath lookup code

---
(limited to 'TurtleArtActivity.py')

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index b962290..7c56b6c 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -72,15 +72,8 @@ class TurtleArtActivity(activity.Activity):
     def __init__(self, handle):
         super(TurtleArtActivity,self).__init__(handle)
 
-        try:
-            datapath = os.path.join(activity.get_activity_root(), "data")
-        except:
-            # Early versions of Sugar (e.g., 656) didn't support
-            # get_activity_root()
-            datapath = os.path.join( \
-                os.environ['HOME'], \
-                ".sugar/default/org.laptop.TurtleArtActivity/data")
-
+        datapath = _get_datapath()
+            
         # Notify when the visibility state changes
         self.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK)
         self.connect("visibility-notify-event", self.__visibility_notify_cb)
@@ -88,7 +81,6 @@ class TurtleArtActivity(activity.Activity):
         try: 
             # Use 0.86 toolbar design
             toolbar_box = ToolbarBox()
-
             # Buttons added to the Activity toolbar
             activity_button = ActivityToolbarButton(self)
 
@@ -442,6 +434,17 @@ class TurtleArtActivity(activity.Activity):
         self.connect('shared', self._shared_cb)
         self.connect('joined', self._joined_cb)
 
+    def _get_datapath(self):
+        try:
+            datapath = os.path.join(activity.get_activity_root(), "data")
+        except:
+            # Early versions of Sugar (e.g., 656) didn't support
+            # get_activity_root()
+            datapath = os.path.join( \
+                os.environ['HOME'], \
+                    ".sugar/default/org.laptop.TurtleArtActivity/data")
+        return datapath
+
     """ Activity toolbar callbacks """
 
     def _do_save_as_html_cb(self, button):
--
cgit v0.9.1