From d778d45b13eb261d623d426097bf36bf6470a398 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Wed, 26 Jul 2006 16:00:28 +0000
Subject: Load the current page when joining an active.

Get back page sharing to work.
---
(limited to 'shell')

diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py
index 86377b8..f17e1c6 100644
--- a/shell/PresenceService/PresenceService.py
+++ b/shell/PresenceService/PresenceService.py
@@ -584,7 +584,7 @@ class PresenceService(object):
 		real_name = Service.compose_service_name(owner_nick, activity_id)
 		if address and type(address) != type(u""):
 			raise ValueError("address must be a unicode string.")
-		if address == None or not len(address):
+		if address == None and stype.endswith('_udp'):
 			# Use random currently unassigned multicast address
 			address = u"232.%d.%d.%d" % (random.randint(0, 254), random.randint(1, 254),
 					random.randint(1, 254))
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index 1b42fbf..53789d4 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -12,8 +12,8 @@ from sugar import theme
 
 theme.setup()
 
-lw = LogWriter(sys.argv[1])
-lw.start()
+#lw = LogWriter(sys.argv[1])
+#lw.start()
 
 if len(sys.argv) == 4:
 	Activity.register_factory(sys.argv[1], sys.argv[2], sys.argv[3])
--
cgit v0.9.1