Commits

commits@gajim.org

17632 discussions

gajim: add a try/except
by Yann Leboulanger 22 Aug '12

22 Aug '12

changeset d6901d0eed53 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d6901d0eed53 description: add a try/except diffstat: src/common/socks5.py | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diffs (52 lines): diff -r 60f54ff36c17 -r d6901d0eed53 src/common/socks5.py --- a/src/common/socks5.py Wed Aug 22 12:55:57 2012 +0200 +++ b/src/common/socks5.py Wed Aug 22 14:49:44 2012 +0200 @@ -1140,26 +1140,31 @@ self.disconnect() return self.idlequeue.remove_timeout(self.fd) - if self.state == 2: # send reply with desired auth type - self.send_raw(self._get_auth_response()) - elif self.state == 4: # send positive response to the 'connect' - self.send_raw(self._get_request_buff(self.sha_msg, 0x00)) - elif self.state == 7: - if self.file_props.paused: - self.file_props.continue_cb = self.continue_paused_transfer - self.idlequeue.plug_idle(self, False, False) - return - result = self.start_transfer() # send - self.queue.process_result(result, self) - if result is None or result <= 0: + try: + if self.state == 2: # send reply with desired auth type + self.send_raw(self._get_auth_response()) + elif self.state == 4: # send positive response to the 'connect' + self.send_raw(self._get_request_buff(self.sha_msg, 0x00)) + elif self.state == 7: + if self.file_props.paused: + self.file_props.continue_cb = self.continue_paused_transfer + self.idlequeue.plug_idle(self, False, False) + return + result = self.start_transfer() # send + self.queue.process_result(result, self) + if result is None or result <= 0: + self.disconnect() + return + self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) + elif self.state == 8: self.disconnect() return - self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) - elif self.state == 8: - self.disconnect() + else: + self.disconnect() + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('caught SSL exception, ignored') return - else: - self.disconnect() if self.state < 5: self.state += 1 # unplug and plug this time for reading

1 0

gajim: coding standards
by Yann Leboulanger 22 Aug '12

22 Aug '12

changeset 60f54ff36c17 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=60f54ff36c17 description: coding standards diffstat: src/adhoc_commands.py | 2 +- src/common/connection_handlers_events.py | 4 +- src/common/dataforms.py | 8 +- src/common/jingle_ft.py | 8 +- src/common/jingle_ftstates.py | 4 +- src/common/jingle_transport.py | 2 +- src/common/pep.py | 26 +++--- src/common/resolver.py | 10 +- src/common/socks5.py | 123 +++++++++++------------------- src/common/stanza_session.py | 2 +- src/config.py | 2 +- src/dataforms_widget.py | 26 +++--- src/groupchat_control.py | 2 +- src/search_window.py | 2 +- src/statusicon.py | 2 +- test/lib/gajim_mocks.py | 2 +- 16 files changed, 96 insertions(+), 129 deletions(-) diffs (truncated from 845 to 300 lines): diff -r b1c321d3f8c9 -r 60f54ff36c17 src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/adhoc_commands.py Wed Aug 22 12:55:57 2012 +0200 @@ -371,7 +371,7 @@ _('The form is not filled correctly.')) self.data_form_widget.set_sensitive(True) return - self.data_form_widget.data_form.type = 'submit' + self.data_form_widget.data_form.type_ = 'submit' else: self.data_form_widget.hide() diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/connection_handlers_events.py Wed Aug 22 12:55:57 2012 +0200 @@ -1683,7 +1683,7 @@ pep = pep_class.get_tag_as_PEP(self.fjid, self.conn.name, self.event_tag) if pep: - self.pep_type = pep.type + self.pep_type = pep.type_ return True items = self.event_tag.getTag('items') @@ -2007,7 +2007,7 @@ return self.dataform = dataforms.ExtendForm(node=form_tag) for f in self.dataform.iter_fields(): - if f.var == 'stream-method' and f.type == 'list-single': + if f.var == 'stream-method' and f.type_ == 'list-single': values = [o[1] for o in f.options] self.file_props.stream_methods = ' '.join(values) if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/dataforms.py --- a/src/common/dataforms.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/dataforms.py Wed Aug 22 12:55:57 2012 +0200 @@ -120,7 +120,7 @@ if extend is None: ExtendedNode.__init__(self, 'field') - self.type = typ + self.type_ = typ self.var = var if value is not None: self.value = value @@ -248,7 +248,7 @@ self.delChild(t) return locals() - + def is_valid(self): return True @@ -463,7 +463,7 @@ def iter_values(self): for element in self.getTags('value'): yield element.getData() - + def is_valid(self): if not self.required: return True @@ -577,7 +577,7 @@ def __getitem__(self, item): return self.vars[item] - + def is_valid(self): for f in self.iter_fields(): if not f.is_valid(): diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/jingle_ft.py Wed Aug 22 12:55:57 2012 +0200 @@ -186,7 +186,7 @@ fingerprint = None if self.use_security: fingerprint = 'client' - if self.transport.type == TransportType.SOCKS5: + if self.transport.type_ == TransportType.SOCKS5: gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props.sid, self.on_connect, self._on_connect_error, fingerprint=fingerprint, @@ -272,7 +272,7 @@ action=None): # Sets up a few transport specific things for the file transfer - if self.transport.type == TransportType.IBB: + if self.transport.type_ == TransportType.IBB: # No action required, just set the state to transfering self.state = STATE_TRANSFERING @@ -323,11 +323,11 @@ if self.weinitiate: listener = gajim.socks5queue.start_listener(port, sha_str, self._store_socks5_sid, self.file_props, - fingerprint=fingerprint, type='sender') + fingerprint=fingerprint, typ='sender') else: listener = gajim.socks5queue.start_listener(port, sha_str, self._store_socks5_sid, self.file_props, - fingerprint=fingerprint, type='receiver') + fingerprint=fingerprint, typ='receiver') if not listener: # send error message, notify the user diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/jingle_ftstates.py Wed Aug 22 12:55:57 2012 +0200 @@ -219,8 +219,8 @@ self.jft.session.connection.name, mode) def action(self, args=None): - if self.jft.transport.type == TransportType.IBB: + if self.jft.transport.type_ == TransportType.IBB: self.__start_IBB_transfer(self.jft.session.connection) - elif self.jft.transport.type == TransportType.SOCKS5: + elif self.jft.transport.type_ == TransportType.SOCKS5: self.__start_SOCK5_transfer() diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/jingle_transport.py Wed Aug 22 12:55:57 2012 +0200 @@ -47,7 +47,7 @@ """ def __init__(self, type_): - self.type = type_ + self.type_ = type_ self.candidates = [] self.remote_candidates = [] diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/pep.py --- a/src/common/pep.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/pep.py Wed Aug 22 12:55:57 2012 +0200 @@ -211,14 +211,14 @@ class AbstractPEP(object): - type = '' + type_ = '' namespace = '' @classmethod def get_tag_as_PEP(cls, jid, account, event_tag): items = event_tag.getTag('items', {'node': cls.namespace}) if items: - log.debug("Received PEP 'user %s' from %s" % (cls.type, jid)) + log.debug("Received PEP 'user %s' from %s" % (cls.type_, jid)) return cls(jid, account, items) else: return None @@ -237,18 +237,18 @@ def _update_contacts(self, jid, account): for contact in gajim.contacts.get_contacts(account, jid): if self._retracted: - if self.type in contact.pep: - del contact.pep[self.type] + if self.type_ in contact.pep: + del contact.pep[self.type_] else: - contact.pep[self.type] = self + contact.pep[self.type_] = self def _update_account(self, account): acc = gajim.connections[account] if self._retracted: - if self.type in acc.pep: - del acc.pep[self.type] + if self.type_ in acc.pep: + del acc.pep[self.type_] else: - acc.pep[self.type] = self + acc.pep[self.type_] = self def asPixbufIcon(self): '''SHOULD be implemented by subclasses''' @@ -262,7 +262,7 @@ class UserMoodPEP(AbstractPEP): '''XEP-0107: User Mood''' - type = 'mood' + type_ = 'mood' namespace = xmpp.NS_MOOD def _extract_info(self, items): @@ -308,7 +308,7 @@ class UserTunePEP(AbstractPEP): '''XEP-0118: User Tune''' - type = 'tune' + type_ = 'tune' namespace = xmpp.NS_TUNE def _extract_info(self, items): @@ -354,7 +354,7 @@ class UserActivityPEP(AbstractPEP): '''XEP-0108: User Activity''' - type = 'activity' + type_ = 'activity' namespace = xmpp.NS_ACTIVITY def _extract_info(self, items): @@ -420,7 +420,7 @@ class UserNicknamePEP(AbstractPEP): '''XEP-0172: User Nickname''' - type = 'nickname' + type_ = 'nickname' namespace = xmpp.NS_NICK def _extract_info(self, items): @@ -449,7 +449,7 @@ class UserLocationPEP(AbstractPEP): '''XEP-0080: User Location''' - type = 'location' + type_ = 'location' namespace = xmpp.NS_LOCATION def _extract_info(self, items): diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/resolver.py --- a/src/common/resolver.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/resolver.py Wed Aug 22 12:55:57 2012 +0200 @@ -295,23 +295,23 @@ IdleCommand.__init__(self, on_result) self.commandtimeout = 10 self.host = host.lower() - self.type = type.lower() + self.type_ = type.lower() if not host_pattern.match(self.host): # invalid host name log.error('Invalid host: %s' % self.host) self.canexecute = False return - if not ns_type_pattern.match(self.type): - log.error('Invalid querytype: %s' % self.type) + if not ns_type_pattern.match(self.type_): + log.error('Invalid querytype: %s' % self.type_) self.canexecute = False return def _compose_command_args(self): - return ['nslookup', '-type=' + self.type, self.host] + return ['nslookup', '-type=' + self.type_, self.host] def _return_result(self): if self.result_handler: - self.result_handler(self.host, self.type, self.result) + self.result_handler(self.host, self.type_, self.result) self.result_handler = None # below lines is on how to use API and assist in testing diff -r b1c321d3f8c9 -r 60f54ff36c17 src/common/socks5.py --- a/src/common/socks5.py Wed Aug 22 12:21:45 2012 +0200 +++ b/src/common/socks5.py Wed Aug 22 12:55:57 2012 +0200 @@ -82,18 +82,18 @@ self.on_success = {} # {id: cb} self.on_failure = {} # {id: cb} - def start_listener(self, port, sha_str, sha_handler, file_props, fingerprint=None, - type='sender'): + def start_listener(self, port, sha_str, sha_handler, file_props, + fingerprint=None, typ='sender'): """ Start waiting for incomming connections on (host, port) and do a socks5 authentication using sid for generated SHA """ sid = file_props.sid - self.type = type # It says whether we are sending or receiving + self.type_ = typ # It says whether we are sending or receiving self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None or self.listener.connections == []: self.listener = Socks5Listener(self.idlequeue, port, file_props, - fingerprint=fingerprint) + fingerprint=fingerprint) self.listener.queue = self self.listener.bind() else: @@ -135,9 +135,9 @@ else: fp = fingerprint if receiving: - self.type = 'receiver' - socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, - file_props, fingerprint=fp) + self.type_ = 'receiver' + socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, + sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: if file_props.sha_str: @@ -145,7 +145,7 @@ else: idx = self.idx self.idx = self.idx + 1 - self.type = 'sender' + self.type_ = 'sender'

1 0

gajim: coding standards
by Yann Leboulanger 22 Aug '12

22 Aug '12

changeset b1c321d3f8c9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b1c321d3f8c9 description: coding standards diffstat: src/common/jingle_ft.py | 10 +++++----- src/common/jingle_ftstates.py | 35 +++++++++++++---------------------- src/common/jingle_xtls.py | 28 +++++++++++++++++----------- 3 files changed, 35 insertions(+), 38 deletions(-) diffs (251 lines): diff -r 573267fad160 -r b1c321d3f8c9 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 22 11:54:21 2012 +0200 +++ b/src/common/jingle_ft.py Wed Aug 22 12:21:45 2012 +0200 @@ -54,7 +54,8 @@ # events we might be interested in self.callbacks['session-initiate'] += [self.__on_session_initiate] - self.callbacks['session-initiate-sent'] += [self.__on_session_initiate_sent] + self.callbacks['session-initiate-sent'] += [ + self.__on_session_initiate_sent] self.callbacks['content-add'] += [self.__on_session_initiate] self.callbacks['session-accept'] += [self.__on_session_accept] self.callbacks['session-terminate'] += [self.__on_session_terminate] @@ -105,7 +106,7 @@ STATE_TRANSFERING : StateTransfering(self), STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) - } + } def __state_changed(self, nextstate, args=None): # Executes the next state action and sets the next state @@ -130,9 +131,8 @@ def __send_hash(self): # Send hash in a session info - checksum = xmpp.Node(tag='checksum', - payload=[xmpp.Node(tag='file', - payload=[self._calcHash()])]) + checksum = xmpp.Node(tag='checksum', payload=[xmpp.Node(tag='file', + payload=[self._calcHash()])]) checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) self.session.__session_info(checksum ) diff -r 573267fad160 -r b1c321d3f8c9 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Wed Aug 22 11:54:21 2012 +0200 +++ b/src/common/jingle_ftstates.py Wed Aug 22 12:21:45 2012 +0200 @@ -17,11 +17,11 @@ from common.socks5 import Socks5ReceiverClient, Socks5SenderClient class JingleFileTransferStates: - - # This class implements the state machine design pattern + ''' + This class implements the state machine design pattern + ''' def __init__(self, jingleft): - self.jft = jingleft def action(self, args=None): @@ -32,7 +32,6 @@ class StateInitialized(JingleFileTransferStates): - ''' This state initializes the file transfer ''' @@ -40,21 +39,19 @@ def action(self, args=None): if self.jft.weinitiate: # update connection's fileprops - self.jft._listen_host() + self.jft._listen_host() # Listen on configured port for file transfer else: fingerprint = None if self.jft.use_security: fingerprint = 'client' # Connect to the candidate host, on success call on_connect method - gajim.socks5queue.connect_to_hosts( - self.jft.session.connection.name, - self.jft.file_props.sid, self.jft.on_connect, - self.jft._on_connect_error, fingerprint=fingerprint) + gajim.socks5queue.connect_to_hosts(self.jft.session.connection.name, + self.jft.file_props.sid, self.jft.on_connect, + self.jft._on_connect_error, fingerprint=fingerprint) class StateCandSent(JingleFileTransferStates): - ''' This state sends our nominated candidate ''' @@ -89,7 +86,6 @@ self._sendCand(args) class StateCandReceived(JingleFileTransferStates): - ''' This state happens when we receive a candidate. It takes the arguments: canError if we receive a candidate-error @@ -112,13 +108,10 @@ # We save the candidate nominated by peer self.jft.nominated_cand['peer-cand'] = streamhost_used - - def action(self, args=None): self._recvCand(args) class StateCandSentAndRecv( StateCandSent, StateCandReceived): - ''' This state happens when we have received and sent the candidates. It takes the boolean argument: sendCand in order to decide whether @@ -126,14 +119,12 @@ ''' def action(self, args=None): - if args['sendCand']: self._sendCand(args) else: self._recvCand(args) class StateTransportReplace(JingleFileTransferStates): - ''' This state initiates transport replace ''' @@ -142,7 +133,6 @@ self.jft.session.transport_replace() class StateTransfering(JingleFileTransferStates): - ''' This state will start the transfer depeding on the type of transport we have. @@ -150,8 +140,8 @@ def __start_IBB_transfer(self, con): fp = open(self.jft.file_props.file_name, 'r') - con.OpenStream( self.jft.transport.sid, - self.jft.session.peerjid, fp, blocksize=4096) + con.OpenStream( self.jft.transport.sid, self.jft.session.peerjid, fp, + blocksize=4096) def __start_SOCK5_transfer(self): # It tells wether we start the transfer as client or server @@ -163,7 +153,7 @@ else: mode = 'server' streamhost_used = self.jft.nominated_cand['peer-cand'] - + if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True # This needs to be changed when requesting @@ -172,7 +162,8 @@ self.jft.file_props.proxy_receiver = streamhost_used['target'] else: self.jft.file_props.proxy_sender = streamhost_used['target'] - self.jft.file_props.proxy_receiver = streamhost_used['initiator'] + self.jft.file_props.proxy_receiver = streamhost_used[ + 'initiator'] # This needs to be changed when requesting if not self.jft.weinitiate and streamhost_used['type'] == 'proxy': @@ -190,7 +181,7 @@ s[sender].connected: return - if streamhost_used['type'] == 'proxy': + if streamhost_used['type'] == 'proxy': self.jft.file_props.streamhost_used = True streamhost_used['sid'] = self.jft.file_props.sid self.jft.file_props.streamhosts = [] diff -r 573267fad160 -r b1c321d3f8c9 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Wed Aug 22 11:54:21 2012 +0200 +++ b/src/common/jingle_xtls.py Wed Aug 22 12:21:45 2012 +0200 @@ -63,8 +63,8 @@ try: f = open(cert_path) except IOError, e: - log.warning('Unable to open certificate file %s: %s' % \ - (cert_path, str(e))) + log.warning('Unable to open certificate file %s: %s' % (cert_path, + str(e))) return lines = f.readlines() i = 0 @@ -76,14 +76,14 @@ cert = ''.join(lines[begin:i+2]) try: x509cert = OpenSSL.crypto.load_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) + OpenSSL.crypto.FILETYPE_PEM, cert) cert_store.add_cert(x509cert) except OpenSSL.crypto.Error, exception_obj: log.warning('Unable to load a certificate from file %s: %s' %\ - (cert_path, exception_obj.args[0][0][2])) + (cert_path, exception_obj.args[0][0][2])) except: log.warning('Unknown error while loading certificate from file ' - '%s' % cert_path) + '%s' % cert_path) begin = -1 i += 1 @@ -94,7 +94,8 @@ ctx = SSL.Context(SSL.TLSv1_METHOD) if fingerprint == 'server': # for testing purposes only - ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb or default_callback) + ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, + verify_cb or default_callback) elif fingerprint == 'client': ctx.set_verify(SSL.VERIFY_PEER, verify_cb or default_callback) @@ -103,13 +104,15 @@ ctx.use_certificate_file(cert_name + '.cert') store = ctx.get_cert_store() for f in os.listdir(os.path.expanduser(gajim.MY_PEER_CERTS_PATH)): - load_cert_file(os.path.join(os.path.expanduser(gajim.MY_PEER_CERTS_PATH), f), store) + load_cert_file(os.path.join(os.path.expanduser( + gajim.MY_PEER_CERTS_PATH), f), store) log.debug('certificate file ' + f + ' loaded fingerprint ' + \ fingerprint) return ctx def send_cert(con, jid_from, sid): - certpath = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) + '.cert' + certpath = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) + \ + '.cert' certfile = open(certpath, 'r') certificate = '' for line in certfile.readlines(): @@ -225,14 +228,17 @@ def make_certs(filepath, CN): """ make self signed certificates - filepath : absolute path of certificate file, will be appended the '.pkey' and '.cert' extensions + filepath : absolute path of certificate file, will be appended the '.pkey' + and '.cert' extensions CN : common name """ key = createKeyPair(TYPE_RSA, 1024) req = createCertRequest(key, CN=CN) cert = createCertificate(req, (req, key), 0, (0, 60*60*24*365*5)) # five years - open(filepath + '.pkey', 'w').write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) - open(filepath + '.cert', 'w').write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) + open(filepath + '.pkey', 'w').write(crypto.dump_privatekey( + crypto.FILETYPE_PEM, key)) + open(filepath + '.cert', 'w').write(crypto.dump_certificate( + crypto.FILETYPE_PEM, cert)) if __name__ == '__main__':

1 0

gajim: fix coding standards
by Yann Leboulanger 22 Aug '12

22 Aug '12

changeset 573267fad160 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=573267fad160 description: fix coding standards diffstat: src/common/jingle_ft.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diffs (77 lines): diff -r 70206f4601fa -r 573267fad160 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 22 11:53:51 2012 +0200 +++ b/src/common/jingle_ft.py Wed Aug 22 11:54:21 2012 +0200 @@ -57,7 +57,7 @@ self.callbacks['session-initiate-sent'] += [self.__on_session_initiate_sent] self.callbacks['content-add'] += [self.__on_session_initiate] self.callbacks['session-accept'] += [self.__on_session_accept] - self.callbacks['session-terminate'] += [self.__on_session_terminate] + self.callbacks['session-terminate'] += [self.__on_session_terminate] self.callbacks['session-info'] += [self.__on_session_info] self.callbacks['transport-accept'] += [self.__on_transport_accept] self.callbacks['transport-replace'] += [self.__on_transport_replace] @@ -117,7 +117,7 @@ gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) - self._listen_host() + self._listen_host() # Delete this after file_props refactoring this shouldn't be necesary self.session.file_hash = self.file_props.hash_ self.session.hash_algo = self.file_props.algo @@ -127,15 +127,15 @@ if self.file_props.hash_ is None: self.hashThread = threading.Thread(target=self.__send_hash) self.hashThread.start() - + def __send_hash(self): # Send hash in a session info - checksum = xmpp.Node(tag='checksum', + checksum = xmpp.Node(tag='checksum', payload=[xmpp.Node(tag='file', payload=[self._calcHash()])]) checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) self.session.__session_info(checksum ) - + def _calcHash(self): # Caculates the hash and returns a xep-300 hash stanza @@ -156,7 +156,7 @@ self.file_props.hash_ = hash_ h.addHash(hash_, self.session.hash_algo) return h - + def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") con = self.session.connection @@ -200,7 +200,7 @@ def __on_session_info(self, stanza, content, error, action): pass - + def __on_transport_accept(self, stanza, content, error, action): log.info("__on_transport_accept") @@ -267,15 +267,15 @@ return # initiate transfer self.__state_changed(STATE_TRANSFERING) - + def __transport_setup(self, stanza=None, content=None, error=None, action=None): # Sets up a few transport specific things for the file transfer - + if self.transport.type == TransportType.IBB: # No action required, just set the state to transfering self.state = STATE_TRANSFERING - + def on_connect(self, streamhost): """

1 0

gajim: re-enable jingle FT
by Yann Leboulanger 22 Aug '12

22 Aug '12

changeset 70206f4601fa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=70206f4601fa description: re-enable jingle FT diffstat: src/filetransfers_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7f3d24b0413a -r 70206f4601fa src/filetransfers_window.py --- a/src/filetransfers_window.py Wed Aug 22 11:53:22 2012 +0200 +++ b/src/filetransfers_window.py Wed Aug 22 11:53:51 2012 +0200 @@ -336,7 +336,7 @@ file_path, file_name, file_desc) if file_props is None: return False - if contact.supports(NS_JINGLE_FILE_TRANSFER) and False: + if contact.supports(NS_JINGLE_FILE_TRANSFER): log.info("contact %s supports jingle file transfer"%(contact.get_full_jid())) gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props)

1 0

gajim: fix var name
by Yann Leboulanger 22 Aug '12

22 Aug '12

changeset 7f3d24b0413a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7f3d24b0413a description: fix var name diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0dd103537abc -r 7f3d24b0413a src/gui_interface.py --- a/src/gui_interface.py Tue Jun 26 17:20:24 2012 -0400 +++ b/src/gui_interface.py Wed Aug 22 11:53:22 2012 +0200 @@ -1163,7 +1163,7 @@ ft = self.instances['file_transfers'] file_props = None # get the file_props of our session - file_props = FilesProp.getFileProp(obj.conn.name, sid) + file_props = FilesProp.getFileProp(obj.conn.name, obj.sid) ft.set_status(file_props, 'stop') file_props.error = -4 # is it the right error code? ft.show_stopped(obj.jid, file_props, 'Peer cancelled ' +

1 0

gajim: typo
by Yann Leboulanger 21 Aug '12

21 Aug '12

changeset 25d3e44badb1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25d3e44badb1 description: typo diffstat: po/he.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 00bff651aede -r 25d3e44badb1 po/he.po --- a/po/he.po Sun Aug 19 15:19:53 2012 +0200 +++ b/po/he.po Tue Aug 21 20:55:05 2012 +0200 @@ -6002,7 +6002,7 @@ #: ../src/common/helpers.py:247 msgid "A_way" -msgstr "לא נ_מצא" +msgstr "_נעדר" #: ../src/common/helpers.py:252 msgid "_Offline"

1 0

gajim: print that we invite someone in a room when we do Drag an...
by Yann Leboulanger 20 Aug '12

20 Aug '12

changeset 2359e1b05621 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2359e1b05621 description: print that we invite someone in a room when we do Drag and Drop or when we create a new room. Fixes #7219 diffstat: src/groupchat_control.py | 2 ++ src/gui_interface.py | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diffs (28 lines): diff -r 2835c873bd69 -r 2359e1b05621 src/groupchat_control.py --- a/src/groupchat_control.py Mon Aug 20 15:23:42 2012 +0200 +++ b/src/groupchat_control.py Mon Aug 20 15:46:20 2012 +0200 @@ -2132,6 +2132,8 @@ return contact_jid = data.decode('utf-8') gajim.connections[self.account].send_invite(self.room_jid, contact_jid) + self.print_conversation(_('%(jid)s has been invited in this room') % { + 'jid': contact_jid}, graphics=False) def handle_message_textview_mykey_press(self, widget, event_keyval, event_keymod): diff -r 2835c873bd69 -r 2359e1b05621 src/gui_interface.py --- a/src/gui_interface.py Mon Aug 20 15:23:42 2012 +0200 +++ b/src/gui_interface.py Mon Aug 20 15:46:20 2012 +0200 @@ -596,6 +596,12 @@ for jid in gajim.automatic_rooms[account][obj.jid]['invities']: obj.conn.send_invite(obj.jid, jid, continue_tag=continue_tag) + gc_control = self.msg_win_mgr.get_gc_control(obj.jid, + account) + if gc_control: + gc_control.print_conversation( + _('%(jid)s has been invited in this room') % { + 'jid': jid}, graphics=False) del gajim.automatic_rooms[account][obj.jid] elif obj.jid not in self.instances[account]['gc_config']: self.instances[account]['gc_config'][obj.jid] = \

1 0

gajim: show in groupchat when we invite someone. Fixes #7219
by Yann Leboulanger 20 Aug '12

20 Aug '12

changeset 2835c873bd69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2835c873bd69 description: show in groupchat when we invite someone. Fixes #7219 diffstat: src/roster_window.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 9b6317fecb63 -r 2835c873bd69 src/roster_window.py --- a/src/roster_window.py Mon Aug 20 14:58:15 2012 +0200 +++ b/src/roster_window.py Mon Aug 20 15:23:42 2012 +0200 @@ -3376,6 +3376,12 @@ if resource: # we MUST have one contact only in list_ contact_jid += '/' + resource gajim.connections[room_account].send_invite(room_jid, contact_jid) + gc_control = gajim.interface.msg_win_mgr.get_gc_control(room_jid, + room_account) + if gc_control: + gc_control.print_conversation( + _('%(jid)s has been invited in this room') % { + 'jid': contact_jid}, graphics=False) def on_all_groupchat_maximized(self, widget, group_list): for (contact, account) in group_list:

1 0

gajim: correctly unset sessions
by Yann Leboulanger 20 Aug '12

20 Aug '12

changeset 9b6317fecb63 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9b6317fecb63 description: correctly unset sessions diffstat: src/message_control.py | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diffs (17 lines): diff -r bb040bbfe145 -r 9b6317fecb63 src/message_control.py --- a/src/message_control.py Mon Aug 20 14:49:29 2012 +0200 +++ b/src/message_control.py Mon Aug 20 14:58:15 2012 +0200 @@ -219,12 +219,7 @@ def remove_session(self, session): if session != self.session: return - last_session = None - if self.other_sessions: - last_session = self.other_sessions.pop(0) - if session not in self.other_sessions: - self.other_sessions.append(session) - self.session = last_session + self.session = None def _nec_message_outgoing(self, obj): # Send the given message to the active tab.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits