Show
Ignore:
Timestamp:
11/09/07 20:30:15 (13 months ago)
Author:
asterix
Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/gajim_0.11.2/src/common/zeroconf/client_zeroconf.py

    r8716 r8955  
    213213        def on_disconnect(self): 
    214214                if self.conn_holder: 
    215                         if self.conn_holder.number_of_awaiting_messages.has_key(self.conn_holder.fd): 
    216                                 if self.conn_holder.number_of_awaiting_messages[self.conn_holder.fd] > 0: 
     215                        if self.conn_holder.number_of_awaiting_messages.has_key(self.fd): 
     216                                if self.conn_holder.number_of_awaiting_messages[self.fd] > 0: 
    217217                                        self._caller.dispatch('MSGERROR',[unicode(self.to), -1, \ 
    218218                                        _('Connection to host could not be established'), None, None]) 
    219                                 del self.conn_holder.number_of_awaiting_messages[self.conn_holder.fd] 
     219                                del self.conn_holder.number_of_awaiting_messages[self.fd] 
    220220                        self.conn_holder.remove_connection(self.sock_hash)  
    221221                if self.__dict__.has_key('Dispatcher'):