diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2008-05-08 13:49:44 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2008-06-13 14:46:38 (GMT) |
| commit | 170a96b5698ae0b0f3e2493d53c86e2e9a00fbea (patch) | |
| tree | e9cf845062b0bd004ff6a348610114970e8f953b | |
| parent | d960e0126a3748a9486fec5dd166998c1b20a16a (diff) | |
add a channel type arg to the PrivateInvitation signal
| -rw-r--r-- | src/presenceservice.py | 8 | ||||
| -rw-r--r-- | src/telepathy_plugin.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/presenceservice.py b/src/presenceservice.py index 0c51f61..88e2904 100644 --- a/src/presenceservice.py +++ b/src/presenceservice.py @@ -568,10 +568,10 @@ class PresenceService(ExportedGObject): self.ActivityInvitation(activity.object_path(), buddy.object_path(), message) - def _private_invitation(self, tp, chan_path): + def _private_invitation(self, tp, chan_path, chan_type): conn = tp.get_connection() self.PrivateInvitation(str(conn.service_name), conn.object_path, - chan_path) + chan_path, chan_type) def _want_to_connect(self, plugin): if plugin == self._ll_plugin: @@ -606,8 +606,8 @@ class PresenceService(ExportedGObject): def ActivityInvitation(self, activity, buddy, message): pass - @dbus.service.signal(PRESENCE_INTERFACE, signature="soo") - def PrivateInvitation(self, bus_name, connection, channel): + @dbus.service.signal(PRESENCE_INTERFACE, signature="soos") + def PrivateInvitation(self, bus_name, connection, channel, chan_type): pass @dbus.service.method(PRESENCE_INTERFACE, in_signature='', diff --git a/src/telepathy_plugin.py b/src/telepathy_plugin.py index c85bdd1..2042111 100644 --- a/src/telepathy_plugin.py +++ b/src/telepathy_plugin.py @@ -74,7 +74,7 @@ class TelepathyPlugin(gobject.GObject): # We were invited to join a chat or a media call # args: # channel object path - (gobject.SIGNAL_RUN_FIRST, None, [object]), + (gobject.SIGNAL_RUN_FIRST, None, [object, str]), 'want-to-connect': # The TelepathyPlugin wants to connect. presenceservice.py will # call the start() method if that's OK with its policy. @@ -477,7 +477,7 @@ class TelepathyPlugin(gobject.GObject): elif (handle_type == HANDLE_TYPE_CONTACT and channel_type in (CHANNEL_TYPE_TEXT, CHANNEL_TYPE_STREAMED_MEDIA)): - self.emit("private-invitation", object_path) + self.emit("private-invitation", object_path, channel_type) elif (handle_type == HANDLE_TYPE_LIST and channel_type == CHANNEL_TYPE_CONTACT_LIST): |