merge

2006-05-21 21:31:57 -04:00
parent 2c272cc892
commit 3841ac9983
9 changed files with 62 additions and 18 deletions
@@ -16,4 +16,6 @@ activitydir = $(pkgdatadir)/activities
 activity_DATA = browser.activity

 EXTRA_DIST =			\
+	$(rc_DATA)		\
+	$(activity_DATA)	\
 	$(icon_DATA)
@@ -322,6 +322,8 @@ class BrowserShell(dbus.service.Object):
 	get_instance = staticmethod(get_instance)

 	def __init__(self):
+		geckoembed.set_profile_path(sugar.env.get_user_dir())
+
 		session_bus = dbus.SessionBus()
 		bus_name = dbus.service.BusName('com.redhat.Sugar.Browser', bus=session_bus)
 		object_path = '/com/redhat/Sugar/Browser'