Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-09-03 13:08:19 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-09-03 13:08:19 (GMT)
commitb0925727b7200b3d0fb2669c213e812ff1dfbe3d (patch)
tree62879e2986e34538ecad68158adb4ad59dbbac24
parentb1cc46bf78800d018a5045210db2888684ce49eb (diff)
Syncing when members leave and rejoin
-rw-r--r--messenger.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/messenger.py b/messenger.py
index 37976fc..35bbc21 100644
--- a/messenger.py
+++ b/messenger.py
@@ -61,12 +61,12 @@ class Messenger(ExportedGObject):
IFACE, path=PATH,
sender_keyword='sender',
byte_arrays=True)
+ self.bus_name = self.tube.get_unique_name()
if self.is_initiator:
_logger.debug('Initialising a new shared browser, I am %s .'
%self.tube.get_unique_name())
else:
# sync with other members
- self.bus_name = self.tube.get_unique_name()
_logger.debug('Joined I am %s .'%self.bus_name)
for member in self.members:
if member != self.bus_name:
@@ -78,7 +78,7 @@ class Messenger(ExportedGObject):
self.entered = True
- def reply_sync(self, a_ids):
+ def reply_sync(self, a_ids, sender):
a_ids.pop()
for link in self.model.data['shared_links']:
if link['hash'] not in a_ids:
@@ -90,7 +90,7 @@ class Messenger(ExportedGObject):
def error_sync(self, e, when):
_logger.error('Error %s: %s'%(when, e))
- @dbus.service.method(dbus_interface=IFACE, in_signature='as', out_signature='as', sender_keyword='sender')
+ @dbus.service.method(dbus_interface=IFACE, in_signature='as', out_signature='ass', sender_keyword='sender')
def sync_with_members(self, b_ids, sender=None):
'''Sync with members '''
b_ids.pop()
@@ -103,7 +103,7 @@ class Messenger(ExportedGObject):
a_ids = self.model.get_links_ids()
a_ids.append('')
# links I want from the caller
- return a_ids
+ return (a_ids, self.bus_name)
@dbus.service.method(dbus_interface=IFACE, in_signature='ssssss', out_signature='')
def send_link(self, id, url, title, color, owner, buffer):