diff options
author | Simon Schampijer <simon@schampijer.de> | 2007-09-01 09:11:36 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2007-09-01 09:11:36 (GMT) |
commit | 6ae5e4111a76f9cb8f59ae6dfc9123365df39467 (patch) | |
tree | ad8f96e324175591b9122980d87db95535d93637 /messenger.py | |
parent | 67ef2bd8e5d9beab0f5dcf0a54567590350ad26c (diff) | |
parent | 632354861696311d758b35e8d7c7888b47a2f7b4 (diff) |
Merge branch 'master' into json
Conflicts:
model.py
webactivity.py
Diffstat (limited to 'messenger.py')
-rw-r--r-- | messenger.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/messenger.py b/messenger.py index 489be0e..e7edbdf 100644 --- a/messenger.py +++ b/messenger.py @@ -21,7 +21,6 @@ import os import dbus from dbus.gobject_service import ExportedGObject import base64 -import sha SERVICE = "org.laptop.WebActivity" IFACE = SERVICE @@ -30,13 +29,12 @@ PATH = "/org/laptop/WebActivity" _logger = logging.getLogger('messenger') class Messenger(ExportedGObject): - def __init__(self, tube, is_initiator, model, linkbar, owner): + def __init__(self, tube, is_initiator, model, owner): ExportedGObject.__init__(self, tube, PATH) self.tube = tube self.is_initiator = is_initiator self.members = [] self.entered = False - self.linkbar = linkbar self.model = model self.owner = owner self.tube.watch_participants(self.participant_change_cb) @@ -102,11 +100,10 @@ class Messenger(ExportedGObject): '''Send link''' _logger.debug('Received data for link.') a_ids = self.model.get_links_ids() + print a_ids if id not in a_ids: thumb = base64.b64decode(buffer) - self.model.links.append( {'hash':sha.new(url).hexdigest(), 'url':url, 'title':title, 'thumb':thumb, - 'owner':owner, 'color':color, 'deleted':0} ) - self.linkbar._add_link(url, thumb, color, title, owner, len(self.model.links)-1) + self.model.add_link(url, title, thumb, owner, color) @dbus.service.signal(IFACE, signature='sssss') def _add_link(self, url, title, color, owner, thumb): @@ -118,9 +115,6 @@ class Messenger(ExportedGObject): handle = self.tube.bus_name_to_handle[sender] if self.tube.self_handle != handle: buffer = base64.b64decode(thumb) - - self.model.links.append( {'hash':sha.new(url).hexdigest(), 'url':url, 'title':title, 'thumb':buffer, - 'owner':owner, 'color':color, 'deleted':0} ) - self.linkbar._add_link(url, buffer, color, title, owner, len(self.model.links)-1) + self.model.add_link(url, title, buffer, owner, color) _logger.debug('Added link: %s to linkbar.'%(url)) |