Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xshell/sugar-shell7
-rw-r--r--sugar/__installed__.py.in3
-rw-r--r--sugar/__uninstalled__.py.in1
3 files changed, 8 insertions, 3 deletions
diff --git a/shell/sugar-shell b/shell/sugar-shell
index 95deb40..9353492 100755
--- a/shell/sugar-shell
+++ b/shell/sugar-shell
@@ -16,12 +16,19 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+import sys
+import os
+
import pygtk
pygtk.require('2.0')
import gtk
from sugar import profile
+from sugar import env
from sugar import TracebackUtils
+
+sys.path.insert(0, os.path.join(env.get_data_dir(), 'shell'))
+
from view.FirstTimeDialog import FirstTimeDialog
from view.Shell import Shell
from model.ShellModel import ShellModel
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 7a7bc28..ff0a830 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -4,7 +4,6 @@ sugar_activities_dir = '@prefix@/share/sugar/activities'
sugar_services_dir = '@prefix@/share/sugar/services'
sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
-sugar_python_path = ['@prefix@/share/sugar/shell',
- '@prefix@/share/sugar/activities',
+sugar_python_path = ['@prefix@/share/sugar/activities',
'@prefix@/share/sugar/services']
sugar_bin_path = []
diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in
index 7593387..869901d 100644
--- a/sugar/__uninstalled__.py.in
+++ b/sugar/__uninstalled__.py.in
@@ -12,7 +12,6 @@ sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf')
sugar_python_path = []
sugar_python_path.append(sugar_source_dir)
-sugar_python_path.append(os.path.join(sugar_source_dir, 'shell'))
sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))
sugar_python_path.append(os.path.join(sugar_source_dir, 'services'))