copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ignore Timeout reached errors, otherwise connection breaks, 

fix dragging of files to local contacts
This commit is contained in:
Stefan Bethge 2006-09-29 00:14:04 +00:00
parent f787d2c1ad
commit 48af9872f5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/zeroconf/zeroconf.py
View File

@ -67,8 +67,10 @@ class Zeroconf:
def error_callback(self, err): def error_callback(self, err):
gajim.log.debug(str(err)) gajim.log.debug(str(err))
self.disconnect() # timeouts are non-critical
self.disconnected_CB() if str(err) != 'Timeout reached':
self.disconnect()
self.disconnected_CB()
def new_service_callback(self, interface, protocol, name, stype, domain, flags): def new_service_callback(self, interface, protocol, name, stype, domain, flags):
gajim.log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, interface, protocol)) gajim.log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, interface, protocol))

10
src/roster_window.py
View File

@ -3584,11 +3584,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if account_dest == 'all': if account_dest == 'all':
# drop on account row in merged mode: we can't know which account it is # drop on account row in merged mode: we can't know which account it is
return return
if account_dest == gajim.ZEROCONF_ACC_NAME:
# drop on zeroconf account, no contact adds possible
return
# if account is not connected, do nothing # if account is not connected, do nothing
if gajim.connections[account_dest].connected < 2: if gajim.connections[account_dest].connected < 2:
return return
@ -3614,6 +3610,10 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
account_dest, c_dest, path) account_dest, c_dest, path)
return return
if account_dest == gajim.ZEROCONF_ACC_NAME:
# drop on zeroconf account, no contact adds possible
return
if position == gtk.TREE_VIEW_DROP_BEFORE and len(path_dest) == 2: if position == gtk.TREE_VIEW_DROP_BEFORE and len(path_dest) == 2:
# dropped before a group : we drop it in the previous group # dropped before a group : we drop it in the previous group
path_dest = (path_dest[0], path_dest[1]-1) path_dest = (path_dest[0], path_dest[1]-1)