diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-19 13:49:57 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-19 13:49:57 (GMT) |
| commit | c65ef6f9cd4afb3560f2551aa9d1ac316711c69b (patch) | |
| tree | ab184f26b4238e0fa6732fe67f2cd270a881f6f1 /sugar/browser | |
| parent | d08ea50d15834cef7649e57fbe6278c60ff7bdc8 (diff) | |
Make the presence service resolve all shared activity services by default; it's up to the activities to ignore services that aren't theirs. Also add 'joined-activity' and 'left-activity' signals on Buddy objects, mainly for the PresenceWindow's 'Who's here' bits
Diffstat (limited to 'sugar/browser')
| -rw-r--r-- | sugar/browser/BrowserShell.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sugar/browser/BrowserShell.py b/sugar/browser/BrowserShell.py index c59de2f..a968772 100644 --- a/sugar/browser/BrowserShell.py +++ b/sugar/browser/BrowserShell.py @@ -37,8 +37,8 @@ class BrowserShell(dbus.service.Object): @dbus.service.method('com.redhat.Sugar.BrowserShell') def open_browser(self, uri, serialized_service=None): service = None -# if serialized_service is not None: -# service = Service.deserialize(serialized_service) + if serialized_service is not None: + service = Service.deserialize(serialized_service) browser = BrowserActivity(uri) self.__browsers.append(browser) gobject.idle_add(self._start_browser_cb, browser, service) |