← Back to branch summary

~ubuntu-branches/ubuntu/trusty/telepathy-butterfly/trusty

« back to all changes in this revision

Viewing changes to butterfly/channel_manager.py

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2010-08-19 17:00:56 UTC
  • mfrom: (8.2.9 experimental)
  • Revision ID: james.westby@ubuntu.com-20100819170056-89bv616gp1j4sjhb
Tags: 0.5.13-1
* New upstream release.
* debian/control:
  - Bump Standards-Version to 3.9.1 (no further changes)
  - Bump python-papyon dependency

Show diffs side-by-side

added added

removed removed

Lines of Context:
butterfly/channel_manager.py
116
116
            ]
117
117
        self.implement_channel_classes(telepathy.CHANNEL_TYPE_CONTACT_LIST, self._get_list_channel, classes)
118
118
 
119
 
#        classes = [
120
 
#            ({telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
121
 
#              telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)},
122
 
#             [telepathy.CHANNEL_INTERFACE + '.TargetHandle',
123
 
#              telepathy.CHANNEL_INTERFACE + '.TargetID',
124
 
#              telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialAudio',
125
 
#              telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialVideo'])
126
 
#            ]
127
 
#        self.implement_channel_classes(telepathy.CHANNEL_TYPE_STREAMED_MEDIA, self._get_media_channel, classes)
 
119
        classes = [
 
120
            ({telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
 
121
              telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)},
 
122
             [telepathy.CHANNEL_INTERFACE + '.TargetHandle',
 
123
              telepathy.CHANNEL_INTERFACE + '.TargetID',
 
124
              telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialAudio',
 
125
              telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialVideo'])
 
126
            ]
 
127
        self.implement_channel_classes(telepathy.CHANNEL_TYPE_STREAMED_MEDIA, self._get_media_channel, classes)
128
128
 
129
129
        classes = [
130
130
            ({telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_FILE_TRANSFER,