sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually register the service. Fix a typo

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-05-12 18:43:03 -04:00
parent aba40b2fd9
commit d9ad506f88
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sugar/browser/browser.py
View File

@ -159,8 +159,11 @@ class NavigationToolbar(gtk.Toolbar):
class BrowserActivity(activity.Activity): class BrowserActivity(activity.Activity):
def __init__(self, group, uri): def __init__(self, group, uri):
activity.Activity.__init__(self) activity.Activity.__init__(self)
self.uri = uri self.uri = uri
self._group = group self._group = group
self._setup_shared(uri)
def _setup_shared(self, uri): def _setup_shared(self, uri):
self._model = self._group.get_store().get_model(uri) self._model = self._group.get_store().get_model(uri)

6
sugar/p2p/Model.py
View File

@ -25,7 +25,8 @@ class ModelRequestHandler(object):
return self._model.set_value(key, value) return self._model.set_value(key, value)
class LocalModel: class LocalModel:
def __init__(self, model_id): def __init__(self, group, model_id):
self._group = group
self._model_id = model_id self._model_id = model_id
self._values = {} self._values = {}
@ -39,6 +40,7 @@ class LocalModel:
service = Service(self._model_id, MODEL_SERVICE_TYPE, service = Service(self._model_id, MODEL_SERVICE_TYPE,
'', MODEL_SERVICE_PORT) '', MODEL_SERVICE_PORT)
self._setup_server(service) self._setup_server(service)
service.register(self._group)
# FIXME this is duplicated with StreamReader # FIXME this is duplicated with StreamReader
def _setup_server(self, service): def _setup_server(self, service):
@ -61,7 +63,7 @@ class Store:
self._local_models = {} self._local_models = {}
def create_model(self, model_id): def create_model(self, model_id):
model = LocalModel(model_id) model = LocalModel(self._group, model_id)
self._local_models[model_id] = model self._local_models[model_id] = model
return model return model