Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/webactivity.py
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-08-31 08:14:17 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-08-31 08:14:17 (GMT)
commit67ef2bd8e5d9beab0f5dcf0a54567590350ad26c (patch)
tree459c04b81175dcea676f2116b966bf3bc248b3b5 /webactivity.py
parentd891133552c7697d6c96d00057ab53e9d579a4e8 (diff)
first work on using json for the hole model
Diffstat (limited to 'webactivity.py')
-rwxr-xr-xwebactivity.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/webactivity.py b/webactivity.py
index d76967d..67c5995 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -90,7 +90,7 @@ class WebActivity(activity.Activity):
self.toolbar._add_link.connect('clicked', self._add_link_button_cb)
self._browser.connect("notify::title", self._title_changed_cb)
- self.model = Model(os.path.dirname(__file__))
+ self.model = Model()
self._main_view = gtk.VBox()
self.set_canvas(self._main_view)
@@ -260,7 +260,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'], link['title'], link['color']))
@@ -268,8 +268,8 @@ class WebActivity(activity.Activity):
self.linkbar._add_link(link['url'], link['thumb'], link['color'], link['title'], 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)