From 5bc2a8a483b914be3ab2a969693c0d575ca7ae8a Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 15 May 2006 17:16:55 -0400
Subject: [PATCH] Get the damned thing to work, finally!

---
 sugar/browser/browser.py          | 10 +++++++++-
 sugar/p2p/Group.py                |  2 +-
 sugar/p2p/NotificationListener.py |  4 ++--
 sugar/p2p/Service.py              |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/sugar/browser/browser.py b/sugar/browser/browser.py
index 6a92fbf5..e4611382 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")
diff --git a/sugar/p2p/Group.py b/sugar/p2p/Group.py
index 58e8be08..9ad189d8 100644
--- a/sugar/p2p/Group.py
+++ b/sugar/p2p/Group.py
@@ -110,7 +110,7 @@ class LocalGroup(Group):
 			
 		for prop in avahi.txt_array_to_string_array(txt):
 			(key, value) = prop.split('=')
-			if key == 'multicast':
+			if key == 'group_address':
 				service.set_group_address(value)		
 
 		if stype == PRESENCE_SERVICE_TYPE:
diff --git a/sugar/p2p/NotificationListener.py b/sugar/p2p/NotificationListener.py
index bce9dc8f..ba89936f 100644
--- a/sugar/p2p/NotificationListener.py
+++ b/sugar/p2p/NotificationListener.py
@@ -9,10 +9,10 @@ class NotificationListener:
 									 self._recv_multicast)
 		server.start()
 		
-		self._listeners = {}
+		self._listeners = []
 	
 	def add_listener(self, listener):
-		self._listeners.add(listener)
+		self._listeners.append(listener)
 	
 	def _recv_multicast(self, msg):
 		for listener in self._listeners:
diff --git a/sugar/p2p/Service.py b/sugar/p2p/Service.py
index 8f5a1fc1..2fa102d2 100644
--- a/sugar/p2p/Service.py
+++ b/sugar/p2p/Service.py
@@ -29,7 +29,7 @@ class Service(object):
 	def set_address(self, address):
 		self._address = address
 
-	def set_group_address(self):
+	def set_group_address(self, group_address):
 		self._group_address = group_address
 
 	def is_multicast(self):