Commit 48af9872 authored by sb's avatar sb
Browse files

ignore Timeout reached errors, otherwise connection breaks,

fix dragging of files to local contacts
parent f787d2c1
......@@ -67,6 +67,8 @@ def entrygroup_commit_error_CB(self, err):
def error_callback(self, err):
gajim.log.debug(str(err))
# timeouts are non-critical
if str(err) != 'Timeout reached':
self.disconnect()
self.disconnected_CB()
......
......@@ -3585,10 +3585,6 @@ def drag_data_received_data(self, treeview, context, x, y, selection, info,
# 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 @@ def drag_data_received_data(self, treeview, context, x, y, selection, info,
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