Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar/presence
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2008-05-08 13:51:25 (GMT)
committer Morgan Collett <morgan.collett@gmail.com>2008-06-13 14:43:26 (GMT)
commitd71635781f5e2d1cadac4774b35a5d5a0ced3c49 (patch)
tree7bf9521591716a8cc5a3f5b8a1118ffc239f6acd /src/sugar/presence
parentcfdc17d6c936f2570b98c9978f493fca18d8276f (diff)
PrivateInvitation now have a channel type arg
Diffstat (limited to 'src/sugar/presence')
-rw-r--r--src/sugar/presence/presenceservice.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py
index 0549d3c..fb59a42 100644
--- a/src/sugar/presence/presenceservice.py
+++ b/src/sugar/presence/presenceservice.py
@@ -51,7 +51,7 @@ class PresenceService(gobject.GObject):
'activity-invitation': (gobject.SIGNAL_RUN_FIRST, None, ([object]*3)),
'private-invitation': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT,
- gobject.TYPE_PYOBJECT])),
+ gobject.TYPE_PYOBJECT, str])),
'activity-appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT])),
'activity-disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
@@ -239,15 +239,15 @@ class PresenceService(gobject.GObject):
gobject.idle_add(self._emit_activity_invitation_signal, activity_path,
buddy_path, message)
- def _emit_private_invitation_signal(self, bus_name, connection, channel):
+ def _emit_private_invitation_signal(self, bus_name, connection, channel, chan_type):
"""Emit GObject event with bus_name, connection and channel"""
- self.emit('private-invitation', bus_name, connection, channel)
+ self.emit('private-invitation', bus_name, connection, channel, chan_type)
return False
- def _private_invitation_cb(self, bus_name, connection, channel):
+ def _private_invitation_cb(self, bus_name, connection, channel, chan_type):
"""Callback for dbus event (forwards to method to emit GObject event)"""
gobject.idle_add(self._emit_private_invitation_signal, bus_name,
- connection, channel)
+ connection, channel, chan_type)
def _emit_activity_appeared_signal(self, object_path):
"""Emit GObject event with presence.activity.Activity object"""