Pass in shell to the service not just model
This commit is contained in:
parent
500f5d8093
commit
64812c7d67
@ -42,8 +42,9 @@ class ShellService(dbus.service.Object):
|
|||||||
XXX At the moment the d-bus service methods do not appear to do
|
XXX At the moment the d-bus service methods do not appear to do
|
||||||
anything other than add_bundle
|
anything other than add_bundle
|
||||||
"""
|
"""
|
||||||
def __init__(self, shell_model):
|
def __init__(self, shell):
|
||||||
self._shell_model = shell_model
|
self._shell = shell
|
||||||
|
self._shell_model = shell.get_model()
|
||||||
|
|
||||||
self._owner = self._shell_model.get_owner()
|
self._owner = self._shell_model.get_owner()
|
||||||
self._owner.connect('nick-changed', self._owner_nick_changed_cb)
|
self._owner.connect('nick-changed', self._owner_nick_changed_cb)
|
||||||
|
@ -115,8 +115,8 @@ if os.environ.has_key("TP_DEBUG"):
|
|||||||
break
|
break
|
||||||
|
|
||||||
model = ShellModel()
|
model = ShellModel()
|
||||||
service = ShellService(model)
|
|
||||||
shell = Shell(model)
|
shell = Shell(model)
|
||||||
|
service = ShellService(shell)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
gtk.main()
|
gtk.main()
|
||||||
|
Loading…
Reference in New Issue
Block a user