X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fchannel_manager.py;h=1f732e177b8efe76010300c189276e2ed60b27fc;hp=592a59c5d48d2e138201dbc099356bdd7ee4b2f8;hb=422b35adb869e943ee019e1d45d24100dfa0d7e4;hpb=548c58651ec7849619b9d823fdeee169be6c87b5

diff --git a/src/channel_manager.py b/src/channel_manager.py
index 592a59c..1f732e1 100644
--- a/src/channel_manager.py
+++ b/src/channel_manager.py
@@ -16,47 +16,78 @@ class ChannelManager(tp.ChannelManager):
 	def __init__(self, connection):
 		tp.ChannelManager.__init__(self, connection)
 
-		fixed = {
-			telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_CONTACT_LIST
-		}
-		self._implement_channel_class(
+		classes = [
+			(
+				{
+					telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_CONTACT_LIST,
+					telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_LIST),
+				},
+				[
+					telepathy.CHANNEL_INTERFACE + '.TargetHandle',
+					telepathy.CHANNEL_INTERFACE + '.TargetID',
+				],
+			),
+		]
+		self.implement_channel_classes(
 			telepathy.CHANNEL_TYPE_CONTACT_LIST,
 			self._get_list_channel,
-			fixed,
-			[]
+			classes,
 		)
 
-		fixed = {
-			telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_TEXT,
-			telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)
-		}
-		self._implement_channel_class(
+		classes = [
+			(
+				{
+					telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_TEXT,
+					telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)
+				},
+				[
+					telepathy.CHANNEL_INTERFACE + '.TargetHandle',
+					telepathy.CHANNEL_INTERFACE + '.TargetID',
+				],
+			),
+		]
+		self.implement_channel_classes(
 			telepathy.CHANNEL_TYPE_TEXT,
 			self._get_text_channel,
-			fixed,
-			[]
+			classes,
 		)
 
-		fixed = {
-			telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_FILE_TRANSFER,
-			telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)
-		}
-		self._implement_channel_class(
+		classes = [
+			(
+				{
+					telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_FILE_TRANSFER,
+					telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)
+				},
+				[
+					telepathy.CHANNEL_INTERFACE + '.TargetHandle',
+					telepathy.CHANNEL_INTERFACE + '.TargetID',
+				],
+			),
+		]
+		self.implement_channel_classes(
 			telepathy.CHANNEL_TYPE_FILE_TRANSFER,
 			self._get_file_transfer_channel,
-			fixed,
-			[]
+			classes,
 		)
 
-		fixed = {
-			telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
-			telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)
-		}
-		self._implement_channel_class(
+		classes = [
+			(
+				{
+					telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
+					telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)
+				},
+				[
+					telepathy.CHANNEL_INTERFACE + '.TargetHandle',
+					telepathy.CHANNEL_INTERFACE + '.TargetID',
+					telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialAudio',
+					telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialVideo',
+				],
+			),
+		]
+		self.implement_channel_classes(
 			telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
 			self._get_media_channel,
-			fixed,
-			[telepathy.CHANNEL_INTERFACE + '.TargetHandle']
+			classes,
 		)
 
 	def _get_list_channel(self, props):