changeset 2ef1876c2266 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=2ef1876c2266 description: fix bad refactoring

diffstat:

src/common/jingle_ft.py | 8 ++++---- src/common/socks5.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (108 lines):

diff -r cecb094f42f3 -r 2ef1876c2266 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Dec 22 20:12:11 2011 -0500 +++ b/src/common/jingle_ft.py Thu Dec 22 21:52:37 2011 -0500 @@ -376,13 +376,13 @@ self.state = STATE_TRANSFERING

# It tells wether we start the transfer as client or server - type = None + mode = None

if self.isOurCandUsed(): - type = 'client' + mode = 'client' streamhost_used = self.nominated_cand['our-cand'] else: - type = 'server' + mode = 'server' streamhost_used = self.nominated_cand['peer-cand']

if streamhost_used['type'] == 'proxy': @@ -445,7 +445,7 @@ else: jid = gajim.get_jid_without_resource(self.session.ourjid) gajim.socks5queue.send_file(self.file_props, - self.session.connection.name, type) + self.session.connection.name, mode)

def get_content(desc): return JingleFileTransfer diff -r cecb094f42f3 -r 2ef1876c2266 src/common/socks5.py --- a/src/common/socks5.py Thu Dec 22 20:12:11 2011 -0500 +++ b/src/common/socks5.py Thu Dec 22 21:52:37 2011 -0500 @@ -309,10 +309,10 @@ result = reader.write_next() self.process_result(result, reader)

- def send_file(self, file_props, account, type): + def send_file(self, file_props, account, mode): for key in self.senders.keys(): if file_props['name'] in key and file_props['sid'] in key \ - and self.senders[key].type == type: + and self.senders[key].mode == mode:

log.info("socks5: sending file") sender = self.senders[key] @@ -570,7 +570,7 @@ self.pollend()

else: - if self.type == 'client': + if self.mode == 'client': self.queue.reconnect_client(self, self.streamhost)

def open_file_for_reading(self): @@ -1088,7 +1088,7 @@

Socks5.__init__(self, idlequeue, host, port, initiator, target, sid)

- self.type = 'server' + self.mode = 'server'

def main(self): """ @@ -1191,7 +1191,7 @@

Socks5.__init__(self, idlequeue, host, port, initiator, target, sid)

- self.type = 'client' + self.mode = 'client'

def main(self, timeout=0): """ @@ -1338,7 +1338,7 @@ def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, port=None, fingerprint = None, connected=True, file_props={}):

- Socks5.__init__(self, idlequeue, host, port, None, None, + Socks5Client.__init__(self, idlequeue, host, port, None, None, file_props['sid'])

Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, @@ -1353,7 +1353,7 @@ def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, port=None, fingerprint = None, connected=True, file_props={}):

- Socks5.__init__(self, idlequeue, host, port, None, None, + Socks5Server.__init__(self, idlequeue, host, port, None, None, file_props['sid'])

Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, @@ -1365,7 +1365,7 @@

def __init__(self, idlequeue, streamhost, sid, file_props = None, fingerprint=None): - Socks5.__init__(self, idlequeue, streamhost['host'], + Socks5Client.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid)

@@ -1380,7 +1380,7 @@ def __init__(self, idlequeue, streamhost, sid, file_props = None, fingerprint=None):

- Socks5.__init__(self, idlequeue, streamhost['host'], + Socks5Server.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid)