diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-15 21:16:55 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-15 21:16:55 (GMT) |
commit | 5bc2a8a483b914be3ab2a969693c0d575ca7ae8a (patch) | |
tree | 3005ec5d716253cc408cf9ab1569bbe41a45cbd5 /sugar/browser | |
parent | 04d57855f81068a1f39d1338b045aa9a1bf60512 (diff) |
Get the damned thing to work, finally!
Diffstat (limited to 'sugar/browser')
-rwxr-xr-x | sugar/browser/browser.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sugar/browser/browser.py b/sugar/browser/browser.py index 6a92fbf..e461138 100755 --- a/sugar/browser/browser.py +++ b/sugar/browser/browser.py @@ -157,15 +157,21 @@ class NavigationToolbar(gtk.Toolbar): self._embed.load_address(address) class BrowserActivity(activity.Activity): + SOLO = 1 + FOLLOWING = 2 + LEADING = 3 + def __init__(self, group, uri): activity.Activity.__init__(self) self.uri = uri self._group = group + self._mode = BrowserActivity.SOLO def _setup_shared(self, uri): self._model = self._group.get_store().get_model(uri) if self._model: + self._mode = BrowserActivity.FOLLOWING self._load_shared_address() self._model.add_listener(self.__shared_address_changed_cb) @@ -205,6 +211,7 @@ class BrowserActivity(activity.Activity): self._model = self._group.get_store().create_model(address) self._model.set_value('current_address', address) self._model.add_listener(self.__shared_address_changed_cb) + self._mode = MODE_LEADING bus = dbus.SessionBus() proxy_obj = bus.get_object('com.redhat.Sugar.Chat', '/com/redhat/Sugar/Chat') @@ -215,7 +222,8 @@ class BrowserActivity(activity.Activity): def __title_cb(self, embed): self.activity_set_tab_text(embed.get_title()) # Temporary hack, we need an UI - self._model.set_value('current_address', self.embed.get_address()) + if self._mode == BrowserActivity.LEADING: + self._model.set_value('current_address', self.embed.get_address()) def _load_shared_address(self): address = self._model.get_value("current_address") |