From 3841ac9983df5e8307ad2aa2ffa89edf7aa23030 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 22 May 2006 01:31:57 +0000 Subject: merge --- (limited to 'sugar/browser') diff --git a/sugar/browser/Makefile.am b/sugar/browser/Makefile.am index 4bf03d2..7aacdd8 100644 --- a/sugar/browser/Makefile.am +++ b/sugar/browser/Makefile.am @@ -16,4 +16,6 @@ activitydir = $(pkgdatadir)/activities activity_DATA = browser.activity EXTRA_DIST = \ + $(rc_DATA) \ + $(activity_DATA) \ $(icon_DATA) diff --git a/sugar/browser/browser.py b/sugar/browser/browser.py index cec6e09..1bc6160 100755 --- a/sugar/browser/browser.py +++ b/sugar/browser/browser.py @@ -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' -- cgit v0.9.1