inital WebKit work, renamed to Surf

* removed much (but probably not all) of the hulahop and xpcom
  references
* renamed Browse -> Surf

11 files changed, 108 insertions, 260 deletions

diff --git a/activity/activity.info b/activity/activity.info
index fc232e3..16cf16d 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
 [Activity]
-name = Browse
+name = Surf
 activity_version = 105
-bundle_id = org.laptop.WebActivity
+bundle_id = org.laptop.Surf
 icon = activity-web
 exec = sugar-activity webactivity.WebActivity -s
 mime_types = image/png;image/gif;image/jpeg;text/html;text/uri-list;application/xhtml+xml;application/rss+xml;application/xml;text/css;application/ogg;audio/x-wav;audio/ogg;video/ogg;audio/x-vorbis+ogg;audio/x-flac+ogg;audio/x-speex+ogg;video/x-theora+ogg;video/x-ogm+ogg
diff --git a/browser.py b/browser.py
index b0a7ae7..75619f2 100644
--- a/browser.py
+++ b/browser.py
@@ -22,12 +22,9 @@ from gettext import gettext as _
 
 import gobject
 import gtk
-import hulahop
-import xpcom
-from xpcom.nsError import *
-from xpcom import components
-from xpcom.components import interfaces
-from hulahop.webview import WebView
+
+import webkit
+from webkit import WebView
 
 from sugar.datastore import datastore
 from sugar import profile
@@ -43,7 +40,7 @@ from progresslistener import ProgressListener
 _ZOOM_AMOUNT = 0.1
 
 class GetSourceListener(object):
-    _com_interfaces_ = interfaces.nsIWebProgressListener
+    #_com_interfaces_ = interfaces.nsIWebProgressListener
     
     def __init__(self, file_path, async_cb, async_err_cb):
         self._file_path = file_path
@@ -51,9 +48,10 @@ class GetSourceListener(object):
         self._async_err_cb = async_err_cb
 
     def onStateChange(self, webProgress, request, stateFlags, status):
-        if stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST and \
-                stateFlags & interfaces.nsIWebProgressListener.STATE_STOP:
-            self._async_cb(self._file_path)
+        #if stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST and \
+        #        stateFlags & interfaces.nsIWebProgressListener.STATE_STOP:
+        #    self._async_cb(self._file_path)
+        pass
 
     def onProgressChange(self, progress, request, curSelfProgress,
                          maxSelfProgress, curTotalProgress, maxTotalProgress):
@@ -69,7 +67,7 @@ class GetSourceListener(object):
         pass
 
 class CommandListener(object):
-    _com_interfaces_ = interfaces.nsIDOMEventListener
+    #_com_interfaces_ = interfaces.nsIDOMEventListener
     def __init__(self, window):
         self._window = window
 
@@ -81,9 +79,9 @@ class CommandListener(object):
         if not uri.startswith('about:neterror?e=nssBadCert'):
             return
 
-        cls = components.classes['@sugarlabs.org/add-cert-exception;1']
-        cert_exception = cls.createInstance(interfaces.hulahopAddCertException)
-        cert_exception.showDialog(self._window)
+        #cls = components.classes['@sugarlabs.org/add-cert-exception;1']
+        #cert_exception = cls.createInstance(interfaces.hulahopAddCertException)
+        #cert_exception.showDialog(self._window)
 
 class Browser(WebView):
 
@@ -98,52 +96,68 @@ class Browser(WebView):
         self.history = HistoryListener()
         self.progress = ProgressListener()
 
-        cls = components.classes["@mozilla.org/typeaheadfind;1"]
-        self.typeahead = cls.createInstance(interfaces.nsITypeAheadFind)
+        #cls = components.classes["@mozilla.org/typeaheadfind;1"]
+        #self.typeahead = cls.createInstance(interfaces.nsITypeAheadFind)
 
         self._jobject = None
 
-        io_service_class = components.classes[ \
-                "@mozilla.org/network/io-service;1"]
-        io_service = io_service_class.getService(interfaces.nsIIOService)
+        #io_service_class = components.classes[ \
+        #        "@mozilla.org/network/io-service;1"]
+        #io_service = io_service_class.getService(interfaces.nsIIOService)
 
         # Use xpcom to turn off "offline mode" detection, which disables
         # access to localhost for no good reason.  (Trac #6250.)
-        io_service2 = io_service_class.getService(interfaces.nsIIOService2)
-        io_service2.manageOfflineStatus = False
+        #io_service2 = io_service_class.getService(interfaces.nsIIOService2)
+        #io_service2.manageOfflineStatus = False
+
+        #cls = components.classes['@mozilla.org/content/style-sheet-service;1']
+        #style_sheet_service = cls.getService(interfaces.nsIStyleSheetService)
 
-        cls = components.classes['@mozilla.org/content/style-sheet-service;1']
-        style_sheet_service = cls.getService(interfaces.nsIStyleSheetService)
+        #if os.path.exists(Browser.AGENT_SHEET):
+        #    agent_sheet_uri = io_service.newURI('file:///' +
+        #                                        Browser.AGENT_SHEET,
+        #                                        None, None)
+        #    style_sheet_service.loadAndRegisterSheet(agent_sheet_uri,
+        #            interfaces.nsIStyleSheetService.AGENT_SHEET)
 
-        if os.path.exists(Browser.AGENT_SHEET):
-            agent_sheet_uri = io_service.newURI('file:///' + 
-                                                Browser.AGENT_SHEET,
-                                                None, None)
-            style_sheet_service.loadAndRegisterSheet(agent_sheet_uri,
-                    interfaces.nsIStyleSheetService.AGENT_SHEET)
+        #if os.path.exists(Browser.USER_SHEET):
+        #    user_sheet_uri = io_service.newURI('file:///' + Browser.USER_SHEET,
+        #                                       None, None)
+        #    style_sheet_service.loadAndRegisterSheet(user_sheet_uri,
+        #            interfaces.nsIStyleSheetService.USER_SHEET)
 
-        if os.path.exists(Browser.USER_SHEET):
-            user_sheet_uri = io_service.newURI('file:///' + Browser.USER_SHEET,
-                                               None, None)
-            style_sheet_service.loadAndRegisterSheet(user_sheet_uri,
-                    interfaces.nsIStyleSheetService.USER_SHEET)
+        settings = self.get_settings()
+        settings.set_property("enable-developer-extras", True)
+
+        # scale other content besides from text as well
+        self.set_full_content_zoom(True)
 
     def do_setup(self):
+        # webkit.WebView doesn't have do_setup(), dunno if it matters...
         WebView.do_setup(self)
 
-        listener = xpcom.server.WrapObject(ContentInvoker(self),
-                                           interfaces.nsIDOMEventListener)
-        self.window_root.addEventListener('click', listener, False)
+        #listener = xpcom.server.WrapObject(ContentInvoker(self),
+        #                                   interfaces.nsIDOMEventListener)
+        #self.window_root.addEventListener('click', listener, False)
 
-        listener = xpcom.server.WrapObject(CommandListener(self.dom_window),
-                                           interfaces.nsIDOMEventListener)
-        self.window_root.addEventListener('command', listener, False)
+        #listener = xpcom.server.WrapObject(CommandListener(self.dom_window),
+        #                                   interfaces.nsIDOMEventListener)
+        #self.window_root.addEventListener('command', listener, False)
 
         self.progress.setup(self)
 
         self.history.setup(self.web_navigation)
 
-        self.typeahead.init(self.doc_shell)
+        #self.typeahead.init(self.doc_shell)
+
+    def load_uri(self, uri):
+        '''
+        WebKit seems to need well-formed URIs:
+        http://www.google.com, not www.google.com
+
+        that could be wrapped here simply.
+        '''
+        self.open(uri)
 
     def get_session(self):
         return sessionstore.get_session(self)
@@ -203,7 +217,7 @@ class PopupDialog(gtk.Window):
         self.view.realize()
 
 class WindowCreator:
-    _com_interfaces_ = interfaces.nsIWindowCreator
+    #_com_interfaces_ = interfaces.nsIWindowCreator
 
     def createChromeWindow(self, parent, flags):
         dialog = PopupDialog()
@@ -223,7 +237,7 @@ class WindowCreator:
 
         return browser.containerWindow
 
-window_creator = WindowCreator()
-cls = components.classes['@mozilla.org/embedcomp/window-watcher;1']
-window_watcher = cls.getService(interfaces.nsIWindowWatcher)
-window_watcher.setWindowCreator(window_creator)
+#window_creator = WindowCreator()
+#cls = components.classes['@mozilla.org/embedcomp/window-watcher;1']
+#window_watcher = cls.getService(interfaces.nsIWindowWatcher)
+#window_watcher.setWindowCreator(window_creator)
diff --git a/downloadmanager.py b/downloadmanager.py
index e41d06f..94dd7ad 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -23,12 +23,6 @@ import urlparse
 import urllib
 
 import gtk
-import hulahop
-import xpcom
-from xpcom.nsError import *
-from xpcom import components
-from xpcom.components import interfaces
-from xpcom.server.factory import Factory
 
 from sugar.datastore import datastore
 from sugar import profile
@@ -70,7 +64,7 @@ def remove_all_downloads():
             download.cleanup_datastore_write()        
 
 class HelperAppLauncherDialog:
-    _com_interfaces_ = interfaces.nsIHelperAppLauncherDialog
+    #_com_interfaces_ = interfaces.nsIHelperAppLauncherDialog
 
     def promptForSaveToFile(self, launcher, window_context,
                             default_file, suggested_file_extension,
@@ -106,13 +100,13 @@ class HelperAppLauncherDialog:
         launcher.saveToDisk(None, False)
         return NS_OK
 
-components.registrar.registerFactory('{64355793-988d-40a5-ba8e-fcde78cac631}',
-                                     'Sugar Download Manager',
-                                     '@mozilla.org/helperapplauncherdialog;1',
-                                     Factory(HelperAppLauncherDialog))
+#components.registrar.registerFactory('{64355793-988d-40a5-ba8e-fcde78cac631}',
+#                                     'Sugar Download Manager',
+#                                     '@mozilla.org/helperapplauncherdialog;1',
+#                                     Factory(HelperAppLauncherDialog))
 
 class Download:
-    _com_interfaces_ = interfaces.nsITransfer
+    #_com_interfaces_ = interfaces.nsITransfer
     
     def init(self, source, target, display_name, mime_info, start_time,
              temp_file, cancelable):
@@ -286,10 +280,10 @@ class Download:
             self.cancelable.cancel(NS_ERROR_FAILURE) #NS_BINDING_ABORTED)
             _active_downloads.remove(self)
 
-components.registrar.registerFactory('{23c51569-e9a1-4a92-adeb-3723db82ef7c}',
-                                     'Sugar Download',
-                                     '@mozilla.org/transfer;1',
-                                     Factory(Download))
+#components.registrar.registerFactory('{23c51569-e9a1-4a92-adeb-3723db82ef7c}',
+#                                     'Sugar Download',
+#                                     '@mozilla.org/transfer;1',
+#                                     Factory(Download))
 
 def save_link(url, text, owner_document):
     # Inspired on Firefox' browser/base/content/nsContextMenu.js:saveLink()
@@ -329,7 +323,7 @@ def _implements_interface(obj, interface):
             raise
 
 class _AuthPromptCallback(object):
-    _com_interfaces_ = interfaces.nsIInterfaceRequestor
+    #_com_interfaces_ = interfaces.nsIInterfaceRequestor
 
     def __init__(self, dom_window):
         self._dom_window = dom_window
@@ -342,7 +336,7 @@ class _AuthPromptCallback(object):
         return None
 
 class _SaveLinkProgressListener(object):
-    _com_interfaces_ = interfaces.nsIStreamListener
+    #_com_interfaces_ = interfaces.nsIStreamListener
 
     """ an object to proxy the data through to
     nsIExternalHelperAppService.doContent, which will wait for the appropriate
diff --git a/edittoolbar.py b/edittoolbar.py
index 08ebd76..22af24a 100644
--- a/edittoolbar.py
+++ b/edittoolbar.py
@@ -17,9 +17,6 @@
 import gtk
 from gettext import gettext as _
 
-from xpcom import components
-from xpcom.components import interfaces
-
 from sugar.activity import activity
 from sugar.graphics import iconentry
 from sugar.graphics.toolbutton import ToolButton
@@ -27,7 +24,7 @@ from sugar.graphics import style
 
 class EditToolbar(activity.EditToolbar):
 
-    _com_interfaces_ = interfaces.nsIObserver
+    #_com_interfaces_ = interfaces.nsIObserver
 
     def __init__(self, browser):
         activity.EditToolbar.__init__(self)
diff --git a/filepicker.py b/filepicker.py
deleted file mode 100644
index 240e7e8..0000000
--- a/filepicker.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright (C) 2007, One Laptop Per Child
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import logging
-import os
-import tempfile
-import shutil
-
-import gtk
-import hulahop
-
-import xpcom
-from xpcom import components
-from xpcom.components import interfaces
-from xpcom.server.factory import Factory
-
-from sugar.graphics.objectchooser import ObjectChooser
-
-_temp_files_to_clean = []
-
-def cleanup_temp_files():
-    for temp_file in _temp_files_to_clean:
-        if os.path.exists(temp_file):
-            os.remove(temp_file)
-            _temp_files_to_clean.remove(temp_file)
-        else:
-            logging.debug('filepicker.cleanup_temp_files: no file %r' 
-                          % temp_file)
-
-class FilePicker:
-    _com_interfaces_ = interfaces.nsIFilePicker
-
-    cid = '{57901c41-06cb-4b9e-8258-37323327b583}'
-    description = 'Sugar File Picker'
-
-    def __init__(self):
-        self._title = None
-        self._parent = None
-        self._file = None
-    
-    def appendFilter(self, title, filter):
-        logging.warning('FilePicker.appendFilter: UNIMPLEMENTED')
-
-    def appendFilters(self, filterMask):
-        logging.warning('FilePicker.appendFilters: UNIMPLEMENTED')
-
-    def init(self, parent, title, mode):
-        self._title = title
-        self._file = None
-        self._parent = hulahop.get_view_for_window(parent)
-        
-        if mode != interfaces.nsIFilePicker.modeOpen:
-            raise xpcom.COMException(NS_ERROR_NOT_IMPLEMENTED)
-
-    def show(self):
-        chooser = ObjectChooser(parent=self._parent)
-        try:
-            result = chooser.run()
-            if result == gtk.RESPONSE_ACCEPT:
-                logging.debug('FilePicker.show: %r' % 
-                              chooser.get_selected_object())
-                jobject = chooser.get_selected_object()
-                if jobject and jobject.file_path:
-                    ext = os.path.splitext(jobject.file_path)[1]
-                    f, new_temp = tempfile.mkstemp(ext)
-                    del f
-
-                    global _temp_files_to_clean
-                    _temp_files_to_clean.append(new_temp)
-                    shutil.copy(jobject.file_path, new_temp)
-
-                    self._file = new_temp
-        finally:
-            chooser.destroy()
-            del chooser
-
-        if self._file:
-            return interfaces.nsIFilePicker.returnOK
-        else:
-            return interfaces.nsIFilePicker.returnCancel
-
-    def set_defaultExtension(self, default_extension):
-        logging.warning('FilePicker.set_defaultExtension: UNIMPLEMENTED')
-
-    def get_defaultExtension(self):
-        logging.warning('FilePicker.get_defaultExtension: UNIMPLEMENTED')
-        return None
-
-    def set_defaultString(self, default_string):
-        logging.warning('FilePicker.set_defaultString: UNIMPLEMENTED')
-
-    def get_defaultString(self):
-        logging.warning('FilePicker.get_defaultString: UNIMPLEMENTED')
-        return None
-
-    def set_displayDirectory(self, display_directory):
-        logging.warning('FilePicker.set_displayDirectory: UNIMPLEMENTED')
-
-    def get_displayDirectory(self):
-        logging.warning('FilePicker.get_displayDirectory: UNIMPLEMENTED')
-        return None
-
-    def set_filterIndex(self, filter_index):
-        logging.warning('FilePicker.set_filterIndex: UNIMPLEMENTED')
-
-    def get_filterIndex(self):
-        logging.warning('FilePicker.get_filterIndex: UNIMPLEMENTED')
-        return None
-
-    def get_file(self):
-        logging.debug('FilePicker.get_file: %r' % self._file)
-        if self._file:
-            cls = components.classes["@mozilla.org/file/local;1"]
-            local_file = cls.createInstance(interfaces.nsILocalFile)
-            local_file.initWithPath(self._file)
-            return local_file
-        else:
-            return None
-
-    def get_Files(self):
-        logging.warning('FilePicker.get_Files: UNIMPLEMENTED')
-        return None
-
-    def get_FileURL(self):
-        logging.warning('FilePicker.get_FileURL: UNIMPLEMENTED')
-        return None
-
-components.registrar.registerFactory(FilePicker.cid,
-                                        FilePicker.description,
-                                        '@mozilla.org/filepicker;1',
-                                        Factory(FilePicker))
diff --git a/palettes.py b/palettes.py
index 1f3bfc2..7353c1a 100644
--- a/palettes.py
+++ b/palettes.py
@@ -20,9 +20,6 @@ import urlparse
 from gettext import gettext as _
 
 import gtk
-import xpcom
-from xpcom import components
-from xpcom.components import interfaces
 
 from sugar.graphics.palette import Palette, Invoker
 from sugar.graphics.menuitem import MenuItem
@@ -33,7 +30,7 @@ from sugar.activity import activity
 import downloadmanager
 
 class ContentInvoker(Invoker):
-    _com_interfaces_ = interfaces.nsIDOMEventListener
+    #_com_interfaces_ = interfaces.nsIDOMEventListener
 
     def __init__(self, browser):
         Invoker.__init__(self)
@@ -203,7 +200,7 @@ class ImagePalette(Palette):
         downloadmanager.save_link(self._url, self._title, self._owner_document)
 
 class _ImageProgressListener(object):
-    _com_interfaces_ = interfaces.nsIWebProgressListener
+    #_com_interfaces_ = interfaces.nsIWebProgressListener
 
     def __init__(self, temp_file):
         self._temp_file = temp_file
diff --git a/progresslistener.py b/progresslistener.py
index 23d4966..80a0df9 100644
--- a/progresslistener.py
+++ b/progresslistener.py
@@ -16,11 +16,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import gobject
-import xpcom
-from xpcom.components import interfaces
 
 class ProgressListener(gobject.GObject):
-    _com_interfaces_ = interfaces.nsIWebProgressListener
+    #_com_interfaces_ = interfaces.nsIWebProgressListener
 
     __gsignals__ = {
         'location-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
@@ -39,16 +37,17 @@ class ProgressListener(gobject.GObject):
         self.total_requests = 0
         self.completed_requests = 0
 
-        self._wrapped_self = xpcom.server.WrapObject( \
-                self, interfaces.nsIWebProgressListener)
-        weak_ref = xpcom.client.WeakReference(self._wrapped_self)
+        self._wrapped_self = None
+        #self._wrapped_self = xpcom.server.WrapObject( \
+        #        self, interfaces.nsIWebProgressListener)
+        #weak_ref = xpcom.client.WeakReference(self._wrapped_self)
 
         self._reset_requests_count()
 
     def setup(self, browser):
-        mask = interfaces.nsIWebProgress.NOTIFY_STATE_NETWORK | \
-               interfaces.nsIWebProgress.NOTIFY_STATE_REQUEST | \
-               interfaces.nsIWebProgress.NOTIFY_LOCATION
+        mask = 0#interfaces.nsIWebProgress.NOTIFY_STATE_NETWORK | \
+               #interfaces.nsIWebProgress.NOTIFY_STATE_REQUEST | \
+               #interfaces.nsIWebProgress.NOTIFY_LOCATION
 
         browser.web_progress.addProgressListener(self._wrapped_self, mask)
     
@@ -67,6 +66,7 @@ class ProgressListener(gobject.GObject):
         pass
         
     def onStateChange(self, webProgress, request, stateFlags, status):
+        '''
         if stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST:
             if stateFlags & interfaces.nsIWebProgressListener.STATE_START:
                 self.total_requests += 1
@@ -87,6 +87,8 @@ class ProgressListener(gobject.GObject):
                                           float(self.total_requests))
         else:
             self.emit('loading-progress', 0.0)
+        '''
+        pass
 
     def onStatusChange(self, webProgress, request, status, message):
         pass
diff --git a/sessionhistory.py b/sessionhistory.py
index b50bb45..86e8b59 100644
--- a/sessionhistory.py
+++ b/sessionhistory.py
@@ -17,11 +17,9 @@
 import logging
 
 import gobject
-import xpcom
-from xpcom.components import interfaces
 
 class HistoryListener(gobject.GObject):
-    _com_interfaces_ = interfaces.nsISHistoryListener
+    #_com_interfaces_ = interfaces.nsISHistoryListener
 
     __gsignals__ = {
         'session-history-changed': (gobject.SIGNAL_RUN_FIRST, 
@@ -34,9 +32,10 @@ class HistoryListener(gobject.GObject):
     def __init__(self):
         gobject.GObject.__init__(self)
 
-        self._wrapped_self = xpcom.server.WrapObject( \
-                self, interfaces.nsISHistoryListener)
-        weak_ref = xpcom.client.WeakReference(self._wrapped_self)
+        self._wrapped_self = None
+        #self._wrapped_self = xpcom.server.WrapObject( \
+        #        self, interfaces.nsISHistoryListener)
+        #weak_ref = xpcom.client.WeakReference(self._wrapped_self)
 
     def setup(self, web_navigation):
         self._session_history = web_navigation.sessionHistory
diff --git a/sessionstore.py b/sessionstore.py
index d4ed3b2..820214e 100644
--- a/sessionstore.py
+++ b/sessionstore.py
@@ -19,9 +19,6 @@
 
 import logging
 
-from xpcom import components
-from xpcom.components import interfaces
-
 def get_session(browser):
     session_history = browser.web_navigation.sessionHistory
         
diff --git a/webactivity.py b/webactivity.py
index 6e93f90..dfecd48 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -121,12 +121,6 @@ def _seed_xs_cookie():
         _logger.debug('seed_xs_cookie: Updated cookie successfully')
 
 
-import hulahop
-hulahop.set_app_version(os.environ['SUGAR_BUNDLE_VERSION'])
-hulahop.startup(_profile_path)
-
-from xpcom import components
-
 def _set_accept_languages():
     ''' Set intl.accept_languages based on the locale
     '''
@@ -142,11 +136,11 @@ def _set_accept_languages():
 
     # e.g. es-uy, es
     pref = lang[0:2] + "-" + lang[3:5].lower()  + ", " + lang[0:2]
-    cls = components.classes["@mozilla.org/preferences-service;1"]
-    prefService = cls.getService(components.interfaces.nsIPrefService)
-    branch = prefService.getBranch('')
-    branch.setCharPref('intl.accept_languages', pref)
-    logging.debug('LANG set')
+    #cls = components.classes["@mozilla.org/preferences-service;1"]
+    #prefService = cls.getService(components.interfaces.nsIPrefService)
+    #branch = prefService.getBranch('')
+    #branch.setCharPref('intl.accept_languages', pref)
+    logging.debug('LANG **NOT** set')
 
 from browser import Browser
 from edittoolbar import EditToolbar
diff --git a/webtoolbar.py b/webtoolbar.py
index 428fd89..4b1dee2 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -20,14 +20,11 @@ from gettext import gettext as _
 import gobject
 import gtk
 import pango
-from xpcom.components import interfaces
-from xpcom import components
 
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.menuitem import MenuItem
 from sugar._sugarext import AddressEntry
 
-import filepicker
 import places
 
 _MAX_HISTORY_ENTRIES = 15
@@ -281,9 +278,9 @@ class WebToolbar(gtk.Toolbar):
         gobject.idle_add(self._reload_session_history, current_page_index)
 
     def _location_changed_cb(self, progress_listener, uri):
-        cls = components.classes['@mozilla.org/intl/texttosuburi;1']
-        texttosuburi = cls.getService(interfaces.nsITextToSubURI)
-        ui_uri = texttosuburi.unEscapeURIForUI(uri.originCharset, uri.spec)
+        #cls = components.classes['@mozilla.org/intl/texttosuburi;1']
+        #texttosuburi = cls.getService(interfaces.nsITextToSubURI)
+        ui_uri = ''#texttosuburi.unEscapeURIForUI(uri.originCharset, uri.spec)
 
         self._set_address(ui_uri)
         self._update_navigation_buttons()
@@ -337,12 +334,13 @@ class WebToolbar(gtk.Toolbar):
         self._set_title(embed.props.title)
 
     def _stop_and_reload_cb(self, button):
-        if self._loading:
-            self._browser.web_navigation.stop( \
-                    interfaces.nsIWebNavigation.STOP_ALL)
-        else:
-            flags = interfaces.nsIWebNavigation.LOAD_FLAGS_NONE
-            self._browser.web_navigation.reload(flags)
+        #if self._loading:
+        #    self._browser.web_navigation.stop( \
+        #            interfaces.nsIWebNavigation.STOP_ALL)
+        #else:
+        #    flags = interfaces.nsIWebNavigation.LOAD_FLAGS_NONE
+        #    self._browser.web_navigation.reload(flags)
+        pass
 
     def _set_loading(self, loading):
         self._loading = loading