Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressentry.py4
-rwxr-xr-xwebactivity.py8
-rwxr-xr-xwebview.py3
3 files changed, 7 insertions, 8 deletions
diff --git a/addressentry.py b/addressentry.py
index d4f57ac..ce9f81a 100644
--- a/addressentry.py
+++ b/addressentry.py
@@ -16,7 +16,7 @@
# Boston, MA 02111-1307, USA.
import gobject
-import _sugar
+import sugar.browser
from sugar.graphics.entry import Entry
class AddressEntry(Entry):
@@ -32,5 +32,5 @@ class AddressEntry(Entry):
Entry.__init__(self, **kwargs)
def create_entry(self):
- self._address_entry = _sugar.AddressEntry()
+ self._address_entry = sugar.browser.AddressEntry()
return self._address_entry
diff --git a/webactivity.py b/webactivity.py
index 34e8aac..96d3405 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -19,7 +19,7 @@ import logging
import dbus
from gettext import gettext as _
-import _sugar
+import sugar.browser
from sugar.activity import activity
from sugar.clipboard import clipboardservice
from sugar import env
@@ -104,17 +104,17 @@ class WebActivity(activity.Activity):
self.set_title(embed.props.title)
def start():
- if not _sugar.browser_startup(env.get_profile_path(), 'gecko'):
+ if not sugar.browser.startup(env.get_profile_path(), 'gecko'):
raise "Error when initializising the web activity."
- download_manager = _sugar.get_download_manager()
+ download_manager = sugar.browser.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)
def stop():
- _sugar.browser_shutdown()
+ sugar.browser.shutdown()
def download_started_cb(download_manager, download):
name = download.get_url().rsplit('/', 1)[1]
diff --git a/webview.py b/webview.py
index 827739d..6035e76 100755
--- a/webview.py
+++ b/webview.py
@@ -22,8 +22,7 @@ import logging
from gettext import gettext as _
from sugar.graphics.filechooser import FileChooserDialog
-from _sugar import Browser
-from _sugar import PushScroller
+from sugar.browser import Browser
class _PopupCreator(gobject.GObject):
__gsignals__ = {