Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Abente <mabente@paraguayeduca.org>2010-07-06 19:39:48 (GMT)
committer Sascha Silbe <sascha-pgp@silbe.org>2010-11-01 16:55:28 (GMT)
commite9b2fb7a92cb86ca375561c040e8a154cf515e50 (patch)
tree240bbecbe8539ad1f5bc32eecac6647e16226dbb
parent12e5b2064c79ef0fc5c738de531f76c7483b9c34 (diff)
Delete profile data only when erased
Profile data should be deleted _only_ when the user explicitly erases the activity from the activities list.
-rw-r--r--src/jarabe/desktop/activitieslist.py2
-rw-r--r--src/jarabe/model/bundleregistry.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 546ac6f..f09e85f 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -376,7 +376,7 @@ class ActivitiesList(gtk.VBox):
if response_id == gtk.RESPONSE_OK:
registry = bundleregistry.get_registry()
bundle = registry.get_bundle(bundle_id)
- registry.uninstall(bundle)
+ registry.uninstall(bundle, delete_profile=True)
class ActivityListPalette(ActivityPalette):
__gtype_name__ = 'SugarActivityListPalette'
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
index 858655f..b96de86 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -386,7 +386,7 @@ class BundleRegistry(gobject.GObject):
elif not self.add_bundle(install_path):
raise RegistrationException
- def uninstall(self, bundle, force=False):
+ def uninstall(self, bundle, force=False, delete_profile=False):
# TODO treat ContentBundle in special way
# needs rethinking while fixing ContentBundle support
if isinstance(bundle, ContentBundle) or \
@@ -409,7 +409,7 @@ class BundleRegistry(gobject.GObject):
install_path = act.get_path()
- bundle.uninstall(install_path, force)
+ bundle.uninstall(install_path, force, delete_profile)
if not self.remove_bundle(install_path):
raise RegistrationException