Commit 48af9872 authored by sb's avatar sb

ignore Timeout reached errors, otherwise connection breaks,

fix dragging of files to local contacts
parent f787d2c1
......@@ -67,8 +67,10 @@ class Zeroconf:
def error_callback(self, err):
gajim.log.debug(str(err))
self.disconnect()
self.disconnected_CB()
# timeouts are non-critical
if str(err) != 'Timeout reached':
self.disconnect()
self.disconnected_CB()
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))
......
......@@ -3584,11 +3584,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if account_dest == 'all':
# drop on account row in merged mode: we can't know which account it is
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 gajim.connections[account_dest].connected < 2:
return
......@@ -3614,6 +3610,10 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
account_dest, c_dest, path)
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:
# dropped before a group : we drop it in the previous group
path_dest = (path_dest[0], path_dest[1]-1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment