Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

1 files changed, 12 insertions, 6 deletions

diff --git a/sugar/bundle/activitybundle.py b/sugar/bundle/activitybundle.py
index f77bdb7..0d5a5b4 100644
--- a/sugar/bundle/activitybundle.py
+++ b/sugar/bundle/activitybundle.py
@@ -252,8 +252,13 @@ class ActivityBundle(Bundle):
             raise RegistrationException
 
     def uninstall(self):
-        if not self.is_installed():
-            raise NotInstalledException
+        if self._unpacked:
+            install_path = self._path
+        else:
+            if not self.is_installed():
+                raise NotInstalledException
+            install_path = os.path.join(env.get_user_activities_path(),
+                                        self._zip_root_dir)
 
         xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.expanduser('~/.local/share'))
 
@@ -271,10 +276,11 @@ class ActivityBundle(Bundle):
             for file in os.listdir(installed_icons_dir):
                 path = os.path.join(installed_icons_dir, file)
                 if os.path.islink(path) and \
-                   os.readlink(path).startswith(self._path):
+                   os.readlink(path).startswith(install_path):
                     os.remove(path)
 
-        self._uninstall()
-
-        # FIXME: notify shell
+        self._uninstall(install_path)
+        
+        if not activity.get_registry().remove_bundle(install_path):
+            raise RegistrationException