diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-02-25 17:03:17 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-02-25 17:03:17 (GMT) |
| commit | a9c4e4b8e5c57519af557a0543aa19a89c8f693c (patch) | |
| tree | 0d44501c24969952cbb5d5ba54709e74c7c93dd8 | |
| parent | 4299dd67657d03a6312ae33e00023e6f07ac45d8 (diff) | |
Fix bug #920.
| -rw-r--r-- | shell/shellservice.py | 4 | ||||
| -rwxr-xr-x | tools/sugar-install-bundle | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/shell/shellservice.py b/shell/shellservice.py index dcbfc0e..c31e501 100644 --- a/shell/shellservice.py +++ b/shell/shellservice.py @@ -1,5 +1,7 @@ import dbus +from sugar.activity import bundleregistry + _DBUS_SERVICE = "org.laptop.Shell" _DBUS_INTERFACE = "org.laptop.Shell" _DBUS_PATH = "/org/laptop/Shell" @@ -15,5 +17,5 @@ class ShellService(dbus.service.Object): @dbus.service.method(_DBUS_INTERFACE, in_signature="s", out_signature="b") def add_bundle(self, bundle_path): - registry = self._shellModel.get_bundle_registry() + registry = bundleregistry.get_registry() return registry.add_bundle(bundle_path) diff --git a/tools/sugar-install-bundle b/tools/sugar-install-bundle index 0945c29..971d974 100755 --- a/tools/sugar-install-bundle +++ b/tools/sugar-install-bundle @@ -14,7 +14,7 @@ def get_bundle_root_dir(file_names): bundle_root_dir = None for file_name in file_names: if not bundle_root_dir: - bundle_root_dir = file_name.partition('/')[0] + bundle_root_dir = file_name.split('/')[0] if not bundle_root_dir.endswith('.activity'): raise 'Incorrect bundle.' else: |