Let the shell deal with extending his own path

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

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 = []

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'))