From 88da2c7e2d83bce4bcae8c4f83432f5484fb6e8d Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@localhost.localdomain>
Date: Mon, 2 Oct 2006 15:41:44 -0400
Subject: [PATCH 1/3] Update makefile

---
 shell/view/frame/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/view/frame/Makefile.am b/shell/view/frame/Makefile.am
index 8d951142..01458cc9 100644
--- a/shell/view/frame/Makefile.am
+++ b/shell/view/frame/Makefile.am
@@ -1,9 +1,9 @@
 sugardir = $(pkgdatadir)/shell/view/frame
 sugar_PYTHON =				\
 	__init__.py			\
+	ActivitiesBox.py		\
 	RightPanel.py			\
 	PanelWindow.py			\
 	Frame.py			\
-	TopPanel.py			\
-	BottomPanel.py			\
+	ZoomBox.py			\
 	MenuStrategy.py

From 3524042ad75063743227cad8fcbeae932610f80c Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@localhost.localdomain>
Date: Mon, 2 Oct 2006 15:46:37 -0400
Subject: [PATCH 2/3] Update makefile

---
 sugar/graphics/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am
index a5f81664..8ad8b8e0 100644
--- a/sugar/graphics/Makefile.am
+++ b/sugar/graphics/Makefile.am
@@ -2,4 +2,7 @@ sugardir = $(pythondir)/sugar/graphics
 sugar_PYTHON =			\
 	__init__.py		\
 	canvasicon.py		\
-	grid.py
+	grid.py			\
+	menuicon.py		\
+	menu.py			\
+	style.py

From 3919643c7dc0f22f6d4068b6b229d654d55b8b4f Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@localhost.localdomain>
Date: Mon, 2 Oct 2006 17:11:20 -0400
Subject: [PATCH 3/3] Expose local name collision errors (ie, somebody else
 registered that service)

---
 services/presence/Service.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/services/presence/Service.py b/services/presence/Service.py
index 2f0e22fa..1057071a 100644
--- a/services/presence/Service.py
+++ b/services/presence/Service.py
@@ -397,14 +397,12 @@ class Service(gobject.GObject):
 		logging.debug("Will register service with name='%s', stype='%s'," \
 				" domain='%s', address='%s', port=%d, info='%s'" % (self._full_name,
 				self._stype, self._domain, self._address, self._port, info))
-		try:
-			self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0,
-					dbus.String(self._full_name), dbus.String(self._stype),
-					dbus.String(self._domain), dbus.String(""), # let Avahi figure the 'host' out
-					dbus.UInt16(self._port), info)
-		except dbus.DBusException, exc:
-			# Local name collision and stuff
-			pass
+
+		self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0,
+				dbus.String(self._full_name), dbus.String(self._stype),
+				dbus.String(self._domain), dbus.String(""), # let Avahi figure the 'host' out
+				dbus.UInt16(self._port), info)
+
 		self._avahi_entry_group.connect_to_signal('StateChanged', self.__entry_group_changed_cb)
 		self._avahi_entry_group.Commit()