sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a relative path in the activities url

Browse Source 
It's just a bit cleaner.
This commit is contained in:
Daniel Narvaez 2013-05-11 01:17:30 +02:00
parent a30af509c2
commit 28fe9b757f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sugar3/activity/htmlactivity.py
View File

@ -21,9 +21,10 @@ from gi.repository import Gdk
from gi.repository import Gio from gi.repository import Gio
from gi.repository import WebKit2 from gi.repository import WebKit2
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import GdkX11
assert GdkX11
from gi.repository import SugarExt from gi.repository import SugarExt
from sugar3.activity import activity
class HTMLActivity(Gtk.Window): class HTMLActivity(Gtk.Window):
@ -52,8 +53,7 @@ class HTMLActivity(Gtk.Window):
settings = self._web_view.get_settings() settings = self._web_view.get_settings()
settings.set_property("enable-developer-extras", True) settings.set_property("enable-developer-extras", True)
self._web_view.load_uri("activity://%s/%s/index.html" % self._web_view.load_uri("activity://%s/index.html" % self._bundle_id)
(self._bundle_id, self._bundle_path))
def run_main_loop(self): def run_main_loop(self):
Gtk.main() Gtk.main()
@ -90,7 +90,8 @@ class HTMLActivity(Gtk.Window):
inspector.show() inspector.show()
def _app_scheme_cb(self, request, user_data): def _app_scheme_cb(self, request, user_data):
path = os.path.join(activity.get_bundle_path(), request.get_path()) path = os.path.join(self._bundle_path,
os.path.relpath(request.get_path(), "/"))
request.finish(Gio.File.new_for_path(path).read(None), request.finish(Gio.File.new_for_path(path).read(None),
-1, Gio.content_type_guess(path, None)[0]) -1, Gio.content_type_guess(path, None)[0])