Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPootle User <translate@rt.laptop.org>2007-11-19 21:05:29 (GMT)
committer Pootle User <translate@rt.laptop.org>2007-11-19 21:05:29 (GMT)
commit044ebf2755444c42f8da681b26d0f5b582bfba18 (patch)
treebe60a462d85d359e0ccb54b9ef4c262fb13f0617
parent926300a1e8dfdcade401b6a03b12525eea0d9fba (diff)
parent240dbd2a3c360ab18e2565e00fe77d50383abfcc (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
-rw-r--r--NEWS5
-rwxr-xr-xactivity/activity.info2
-rwxr-xr-xwebactivity.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index df12cdc..a60261b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+74
+
+* change the LIBRARY_PATH to point to
+ /usr/share/library-common/index.html (erikos)
+
73
* #4909: added a dbus call to open the source data by the journal (marco)
diff --git a/activity/activity.info b/activity/activity.info
index 4c02d77..c344e71 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Browse
-activity_version = 73
+activity_version = 74
service_name = org.laptop.WebActivity
icon = activity-web
exec = sugar-activity webactivity.WebActivity -s
diff --git a/webactivity.py b/webactivity.py
index 123e28d..d5b71c3 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -47,7 +47,7 @@ import filepicker
import sessionhistory
import progresslistener
-_LIBRARY_PATH = '/home/olpc/Library/index.html'
+_LIBRARY_PATH = '/usr/share/library-common/index.html'
from model import Model
from sugar.presence.tubeconn import TubeConnection