diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-29 16:31:35 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-29 16:31:35 (GMT) |
commit | 64812c7d67c3f926cb7348bd8fffcf6f4d1f219f (patch) | |
tree | 6913ba1a295e00c6cca7cfda24a2001a980c383e | |
parent | 500f5d8093024a9321704212db6b73305a6da843 (diff) |
Pass in shell to the service not just model
-rw-r--r-- | shell/shellservice.py | 5 | ||||
-rwxr-xr-x | shell/sugar-shell | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/shell/shellservice.py b/shell/shellservice.py index 55a74bd..d44144c 100644 --- a/shell/shellservice.py +++ b/shell/shellservice.py @@ -42,8 +42,9 @@ class ShellService(dbus.service.Object): XXX At the moment the d-bus service methods do not appear to do anything other than add_bundle """ - def __init__(self, shell_model): - self._shell_model = shell_model + def __init__(self, shell): + self._shell = shell + self._shell_model = shell.get_model() self._owner = self._shell_model.get_owner() self._owner.connect('nick-changed', self._owner_nick_changed_cb) diff --git a/shell/sugar-shell b/shell/sugar-shell index d84827b..08b7b85 100755 --- a/shell/sugar-shell +++ b/shell/sugar-shell @@ -115,8 +115,8 @@ if os.environ.has_key("TP_DEBUG"): break model = ShellModel() -service = ShellService(model) shell = Shell(model) +service = ShellService(shell) try: gtk.main() |