changeset 4c57cd302a0a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=4c57cd302a0a
description: fix import loops
diffstat:
src/common/jingle_ft.py | 1 -
src/common/protocol/bytestream.py | 10 ++++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diffs (73 lines):
diff -r 978fcbe254c1 -r 4c57cd302a0a src/common/jingle_ft.py
--- a/src/common/jingle_ft.py Tue Jun 28 18:31:07 2011 -0400
+++ b/src/common/jingle_ft.py Sat Jul 02 00:47:33 2011 +0200
@@ -24,7 +24,6 @@
from jingle_content import contents, JingleContent
from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5
from jingle_transport import JingleTransportIBB
-from jingle_session import JingleStates
from common import helpers
from common.socks5 import Socks5Receiver
from common.connection_handlers_events import FileRequestReceivedEvent
diff -r 978fcbe254c1 -r 4c57cd302a0a src/common/protocol/bytestream.py
--- a/src/common/protocol/bytestream.py Tue Jun 28 18:31:07 2011 -0400
+++ b/src/common/protocol/bytestream.py Sat Jul 02 00:47:33 2011 +0200
@@ -37,8 +37,6 @@
from common import gajim
from common import helpers
from common import dataforms
-from common.connection_handlers_events import FileRequestReceivedEvent, \
- FileRequestErrorEvent
from common import ged
from common import jingle_xtls
@@ -250,6 +248,7 @@
raise xmpp.NodeProcessed
def _siSetCB(self, con, iq_obj):
+ from common.connection_handlers_events import FileRequestReceivedEvent
gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self,
stanza=iq_obj))
raise xmpp.NodeProcessed
@@ -269,6 +268,7 @@
return
jid = self._ft_get_from(iq_obj)
file_props['error'] = -3
+ from common.connection_handlers_events import FileRequestErrorEvent
gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self,
jid=jid, file_props=file_props, error_msg=''))
raise xmpp.NodeProcessed
@@ -302,6 +302,8 @@
if contact.get_full_jid() == receiver_jid:
file_props['error'] = -5
self.remove_transfer(file_props)
+ from common.connection_handlers_events import \
+ FileRequestErrorEvent
gajim.nec.push_incoming_event(FileRequestErrorEvent(None,
conn=self, jid=contact.jid, file_props=file_props,
error_msg=''))
@@ -364,6 +366,7 @@
self._result_socks5_sid, file_props['sid'])
if not listener:
file_props['error'] = -5
+ from common.connection_handlers_events import FileRequestErrorEvent
gajim.nec.push_incoming_event(FileRequestErrorEvent(None,
conn=self,
jid=unicode(receiver), file_props=file_props, error_msg=''))
self._connect_error(unicode(receiver), file_props['sid'],
@@ -494,6 +497,8 @@
if file_props is not None:
self.disconnect_transfer(file_props)
file_props['error'] = -3
+ from common.connection_handlers_events import \
+ FileRequestErrorEvent
gajim.nec.push_incoming_event(FileRequestErrorEvent(None,
conn=self, jid=to, file_props=file_props, error_msg=msg))
@@ -526,6 +531,7 @@
return
file_props = self.files_props[id_]
file_props['error'] = -4
+ from common.connection_handlers_events import FileRequestErrorEvent
gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self,
jid=jid, file_props=file_props, error_msg=''))
raise xmpp.NodeProcessed
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
