merge

sugar/browser/Makefile.am

@@ -2,7 +2,12 @@ sugardir = $(pythondir)/sugar/browser
 sugar_PYTHON =			\
 	__init__.py		\
 	browser.py		\
-	NotificationBar.py	
+	NotificationBar.py	\
+	BrowserShell.py         \
+	WebActivity.py          \
+	AddressItem.py          \
+	BrowserActivity.py      \
+	NavigationToolbar.py
 
 icondir = $(pkgdatadir)
 icon_DATA =		\

sugar/p2p/presence.py

@@ -1,6 +1,6 @@
 # -*- tab-width: 4; indent-tabs-mode: t -*- 
 
-import avahi, dbus, dbus.glib, dbus_bindings
+import avahi, dbus, dbus.glib, dbus.dbus_bindings
 
 ACTION_SERVICE_NEW = 'new'
 ACTION_SERVICE_REMOVED = 'removed'
@@ -97,7 +97,7 @@ class PresenceAnnounce(object):
 					"", "", # domain, host (let the system figure it out)
 					dbus.UInt16(rs_port), info,)
 			g.Commit()
-		except dbus_bindings.DBusException, exc:
+		except dbus.dbus_bindings.DBusException, exc:
 			# FIXME: ignore local name collisions, since that means
 			# the zeroconf service is already registered.  Ideally we
 			# should un-register it an re-register with the correct info

sugar/shell/Makefile.am

@@ -2,4 +2,5 @@ sugardir = $(pythondir)/sugar/shell
 sugar_PYTHON =		\
 	__init__.py	\
 	activity.py	\
-	shell.py
+	shell.py        \
+	PresenceWindow.py