diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2006-11-10 13:14:15 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2006-11-10 13:14:15 (GMT) |
| commit | 61f24de7482ceb48335d1b2635de5fdff93fd0d9 (patch) | |
| tree | 2b40a632261c980900d58889e24e60d7f3a11dce /activities | |
| parent | d958e20df74edeedaaa345e40513dcba7b80d3af (diff) | |
Reverting clipboard changes pushed by mistake. These are commits 23565cfd483e38d3a64cd5980deea47cccb28581 and a7e4092b0e4f3d30a21ee5a7982aecd5252a0822.
Diffstat (limited to 'activities')
| -rw-r--r-- | activities/web/webactivity.py | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/activities/web/webactivity.py b/activities/web/webactivity.py index 6fc0fac..200bd39 100644 --- a/activities/web/webactivity.py +++ b/activities/web/webactivity.py @@ -18,12 +18,10 @@ from gettext import gettext as _ import gtk import gtkmozembed import logging -import dbus import _sugar from sugar.activity import ActivityFactory from sugar.activity.Activity import Activity -from sugar.clipboard import ClipboardService from sugar import env from sugar.graphics import style import web.stylesheet @@ -106,28 +104,12 @@ def start(): style.load_stylesheet(web.stylesheet) - download_manager = _sugar.get_download_manager() - download_manager.connect('download-started', download_started_cb) - download_manager.connect('download-completed', download_completed_cb) - download_manager.connect('download-cancelled', download_started_cb) - download_manager.connect('download-progress', download_progress_cb) + chandler = _sugar.get_browser_chandler() + chandler.connect('handle-content', handle_content_cb) def stop(): gtkmozembed.pop_startup() -def download_started_cb(download_manager, url, mimeType, tmpFileName): - cbService = ClipboardService.get_instance() - cbService.add_object(mimeType, tmpFileName) - -def download_completed_cb(download_manager, tmpFileName): - cbService = ClipboardService.get_instance() - cbService.update_object_state(tmpFileName, 100) - -def download_cancelled_cb(download_manager, tmpFileName): - cbService = ClipboardService.get_instance() - #FIXME: Needs to update the state of the object to 'download stopped' - #cbService.update_object_state(tmpFileName, 100) - -def download_progress_cb(download_manager, tmpFileName, progress): - cbService = ClipboardService.get_instance() - cbService.update_object_state(tmpFileName, progress) +def handle_content_cb(chandler, url, mimeType, tmpFileName): + activity = ActivityFactory.create("org.laptop.sugar.Xbook") + activity.execute("open_document", [tmpFileName]) |