diff options
Diffstat (limited to 'webactivity.py')
| -rwxr-xr-x | webactivity.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webactivity.py b/webactivity.py index 95b810b..b0180db 100755 --- a/webactivity.py +++ b/webactivity.py @@ -89,7 +89,8 @@ class WebActivity(activity.Activity): self.toolbar._add_link.connect('clicked', self._share_link_button_cb) self._browser.connect("notify::title", self._title_changed_cb) - self.model = Model(os.path.dirname(__file__)) + + self.model = Model() self.model.connect('add_link', self._add_link_model_cb) self._main_view = gtk.VBox() @@ -261,7 +262,7 @@ class WebActivity(activity.Activity): def read_file(self, file_path): if self.metadata['mime_type'] == 'text/plain': - self.model.read(file_path) + self.model.deserialize(file_path) i=0 for link in self.model.links: _logger.debug('read: url=%s title=%s d=%s' % (link['url'], @@ -273,8 +274,8 @@ class WebActivity(activity.Activity): link['owner'], i) i+=1 - if self.model.session_data is not '': - self._browser.set_session(self.model.session_data) + if self.model.data['history'] is not '': + self._browser.set_session(self.model.data['history']) else: self._browser.load_uri(file_path) _sugarext.set_prgname(self.sname) @@ -293,9 +294,8 @@ class WebActivity(activity.Activity): link['title'], link['color'])) - self.model.session_data = self._browser.get_session() - _logger.debug('Trying save session: %s.' % self.model.session_data) - self.model.write(file_path) + self.model.data['history'] = self._browser.get_session() + # self.model.write(file_path) def _share_link_button_cb(self, button): self._add_link() |