Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar
Conflicts: sugar/browser/BrowserActivity.py
This commit is contained in:
@@ -43,7 +43,6 @@ class BrowserActivity(activity.Activity):
|
||||
self._model = None
|
||||
|
||||
def _service_appeared_cb(self, pservice, buddy, service):
|
||||
print 'appeared ' + service.get_type()
|
||||
if service.get_type() == _BROWSER_ACTIVITY_TYPE:
|
||||
self._notif_service = service
|
||||
elif service.get_type() == LocalModel.SERVICE_TYPE:
|
||||
|
||||
Reference in New Issue
Block a user