← Back to branch summary

~ubuntu-branches/ubuntu/maverick/telepathy-butterfly/maverick

« back to all changes in this revision

Viewing changes to butterfly/channel/conference.py

  • Committer: Bazaar Package Importer
  • Author(s): Jonny Lamb
  • Date: 2010-04-08 15:03:52 UTC
  • mfrom: (1.1.16 upstream) (8.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100408150352-k9hs71f17fyq0lxr
Tags: 0.5.8-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
butterfly/channel/conference.py
128
128
        # Get IntitialInviteeHandles
129
129
        for invitee_handle in props.get(CHANNEL_INTERFACE_CONFERENCE + '.InitialInviteeHandles', []):
130
130
            handle = self._conn_ref().handle(telepathy.HANDLE_TYPE_CONTACT, invitee_handle)
131
 
            if handle is not None and handle not in self._conference_initial_invitees:
 
131
 
 
132
            if handle is None or handle.contact is None:
 
133
                raise telepathy.NotAvailable('Contact with handle %u not available' % invitee_handle)
 
134
 
 
135
            if handle not in self._conference_initial_invitees:
132
136
                self._conference_initial_invitees.append(handle)
133
137
 
134
138
        # Get InitialInviteeIDs
139
143
                    handle = h
140
144
                    break
141
145
 
142
 
            if handle is not None and handle not in self._conference_initial_invitees:
 
146
            if handle is None or handle.contact is None:
 
147
                raise telepathy.NotAvailable('Contact "%s" not available' % invitee_id)
 
148
 
 
149
            if handle not in self._conference_initial_invitees:
143
150
                self._conference_initial_invitees.append(handle)
144
151
 
145
152
        # Actually invite all the initial invitees