diff -Nur -x '*.orig' -x '*~' telepathy-butterfly-0.5.0/butterfly/connection.py telepathy-butterfly-0.5.0.new/butterfly/connection.py --- telepathy-butterfly-0.5.0/butterfly/connection.py 2009-07-28 15:11:49.000000000 +0200 +++ telepathy-butterfly-0.5.0.new/butterfly/connection.py 2009-08-09 21:28:38.000000000 +0200 @@ -169,10 +169,15 @@ return handles def _generate_props(self, channel_type, handle, suppress_handler): + __th = 0 + __tht = telepathy.HANDLE_TYPE_NONE + if handle is not None: + __th = handle.get_id() + __tht = handle.get_type() return { telepathy.CHANNEL_INTERFACE + '.ChannelType': channel_type, - telepathy.CHANNEL_INTERFACE + '.TargetHandle': 0 if handle is None else handle.get_id(), - telepathy.CHANNEL_INTERFACE + '.TargetHandleType': telepathy.HANDLE_TYPE_NONE if handle is None else handle.get_type(), + telepathy.CHANNEL_INTERFACE + '.TargetHandle': __th, + telepathy.CHANNEL_INTERFACE + '.TargetHandleType': __tht, telepathy.CHANNEL_INTERFACE + '.Requested': suppress_handler }