Change some callbacks from _foo_bar_cb to __foo_bar_cb

4 files changed, 35 insertions, 18 deletions

diff --git a/bookmarklettoolbar.py b/bookmarklettoolbar.py
index 18d93e9..dec4ea6 100644
--- a/bookmarklettoolbar.py
+++ b/bookmarklettoolbar.py
@@ -38,7 +38,7 @@ class BookmarkletButton(ToolButton):
     
         # set up the button
         ToolButton.__init__(self, 'bookmarklet')
-        self.connect('clicked', self._clicked_cb)
+        self.connect('clicked', self.__clicked_cb)
         toolbar.insert(self, -1)
         
         # and its palette
@@ -46,7 +46,7 @@ class BookmarkletButton(ToolButton):
         self.set_palette(palette)
         
         menu_item = gtk.MenuItem(_('Remove'))
-        menu_item.connect('activate', self._remove_cb)
+        menu_item.connect('activate', self.__remove_cb)
         palette.menu.append(menu_item)
         menu_item.show()
         
@@ -60,10 +60,10 @@ class BookmarkletButton(ToolButton):
         gobject.timeout_add(500, self.set_icon, 'bookmarklet-inverted')
         gobject.timeout_add(800, self.set_icon, 'bookmarklet')
                     
-    def _clicked_cb(self, button):
+    def __clicked_cb(self, button):
         self._browser.load_uri(self._uri)
 
-    def _remove_cb(self, widget):
+    def __remove_cb(self, widget):
         bookmarklets.get_store().remove(self._name)
         self.destroy()
         
diff --git a/ssb.py b/ssb.py
index 7758b91..b46569b 100644
--- a/ssb.py
+++ b/ssb.py
@@ -20,7 +20,7 @@ import tempfile
 import zipfile
 import ConfigParser
 import logging
-import functools
+from fnmatch import fnmatch
 
 from sugar.activity import activity
 from sugar.bundle.activitybundle import ActivityBundle
diff --git a/usercode.py b/usercode.py
index 21c2fe6..cda8d90 100644
--- a/usercode.py
+++ b/usercode.py
@@ -112,24 +112,24 @@ class StyleEditor(Dialog):
         
         self._cancel_button = gtk.Button(label=_('Cancel'))
         self._cancel_button.set_image(Icon(icon_name='dialog-cancel'))
-        self._cancel_button.connect('clicked', self._cancel_button_cb)
+        self._cancel_button.connect('clicked', self.__cancel_button_cb)
         buttonbox.pack_start(self._cancel_button)
         
         self._save_button = gtk.Button(label=_('Save'))
         self._save_button.set_image(Icon(icon_name='dialog-ok'))
-        self._save_button.connect('clicked', self._save_button_cb)
+        self._save_button.connect('clicked', self.__save_button_cb)
         buttonbox.pack_start(self._save_button)
                                    
         vbox.pack_start(buttonbox, expand=False)
         
         self.add(vbox)
 
-    def _save_button_cb(self, button):
+    def __save_button_cb(self, button):
         self._editor.write()
         self.emit('userstyle-changed')
         self.destroy()
         
-    def _cancel_button_cb(self, button):
+    def __cancel_button_cb(self, button):
         self.destroy()
 
 class ScriptEditor(Dialog):
@@ -140,7 +140,7 @@ class ScriptEditor(Dialog):
         hbox = gtk.HBox()
         
         self._fileview = ScriptFileViewer(SCRIPTS_PATH)
-        self._fileview.connect('file-selected', self._file_selected_cb)
+        self._fileview.connect('file-selected', self.__file_selected_cb)
         hbox.pack_start(self._fileview, expand=False)
         
         editbox = gtk.VBox()        
@@ -151,17 +151,17 @@ class ScriptEditor(Dialog):
         
         self._cancel_button = gtk.Button(label=_('Close'))
         self._cancel_button.set_image(Icon(icon_name='dialog-cancel'))
-        self._cancel_button.connect('clicked', self._cancel_button_cb)
+        self._cancel_button.connect('clicked', self.__cancel_button_cb)
         buttonbox.pack_start(self._cancel_button)
         
         self._delete_button = gtk.Button(label=_('Delete'))
         self._delete_button.set_image(Icon(icon_name='stock_delete'))
-        self._delete_button.connect('clicked', self._delete_button_cb)
+        self._delete_button.connect('clicked', self.__delete_button_cb)
         buttonbox.pack_start(self._delete_button)
         
         self._save_button = gtk.Button(label=_('Save'))
         self._save_button.set_image(Icon(icon_name='dialog-ok'))
-        self._save_button.connect('clicked', self._save_button_cb)
+        self._save_button.connect('clicked', self.__save_button_cb)
         buttonbox.pack_start(self._save_button)
         
         editbox.pack_start(buttonbox, expand=False)
@@ -169,22 +169,22 @@ class ScriptEditor(Dialog):
         
         self.add(hbox)
         
-        self._file_selected_cb(self._fileview, 
+        self.__file_selected_cb(self._fileview, 
                                self._fileview._initial_filename)
     
-    def _save_button_cb(self, button):
+    def __save_button_cb(self, button):
         self._editor.write()
         
-    def _delete_button_cb(self, button):
+    def __delete_button_cb(self, button):
         file_path = self._fileview.get_selected_file()
         
         self._fileview.remove_file(file_path)
         os.remove(file_path)
         
-    def _cancel_button_cb(self, button):
+    def __cancel_button_cb(self, button):
         self.destroy()
         
-    def _file_selected_cb(self, view, file_path):
+    def __file_selected_cb(self, view, file_path):
         self._editor.file_path = self._fileview.get_selected_file()
 
 
diff --git a/webactivity.py b/webactivity.py
index ca35d70..478c073 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -412,6 +412,23 @@ class WebActivity(activity.Activity):
             default_page = os.path.join(activity.get_bundle_path(), 
                                         "data/index.html")
             self._browser.load_uri(default_page)
+            
+        cls = components.classes["@mozilla.org/network/io-service;1"]
+        io_service = cls.getService(interfaces.nsIIOService)
+
+        cls = components.classes[ \
+                    '@mozilla.org/embedding/browser/nsWebBrowserPersist;1']
+        browser_persist = cls.getService(interfaces.nsIWebBrowserPersist)
+        
+        
+        file_path = os.path.join(activity.get_activity_root(),
+                                 'data/saved/x.html')
+        file_uri = io_service.newURI('file://'+file_path)
+        data_path = os.path.join(activity.get_activity_root(), 'data/saved/x')
+        data_uri = io_service.newURI('file://'+data_path)
+        
+        browser_persist.saveDocument(None, file_uri, data_uri, None, None, 
+                                     None)
 
     def _session_history_changed_cb(self, session_history, link):
         _logger.debug('NewPage: %s.' %link)