diff options
author | Dan Williams <dcbw@redhat.com> | 2006-05-22 01:31:57 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2006-05-22 01:31:57 (GMT) |
commit | 3841ac9983df5e8307ad2aa2ffa89edf7aa23030 (patch) | |
tree | 32a16e73363c000d18f7b218b298b3d0a1e43149 /sugar/browser | |
parent | 2c272cc8925540562b9a45202b674d7a75a33263 (diff) |
merge
Diffstat (limited to 'sugar/browser')
-rw-r--r-- | sugar/browser/Makefile.am | 2 | ||||
-rwxr-xr-x | sugar/browser/browser.py | 2 |
2 files changed, 4 insertions, 0 deletions
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' |