Commits September 2012

commits@gajim.org

3 participants
33 discussions

gajim: [Aлекс]. Fix time string encoding in the russian windows(...
by Fomin Denis 03 Sep '12

03 Sep '12

changeset c1103a8737dc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c1103a8737dc description: [Aлекс]. Fix time string encoding in the russian windows(cp1251). diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4d141800e2e6 -r c1103a8737dc src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 02 12:59:55 2012 -0400 +++ b/src/conversation_textview.py Mon Sep 03 22:02:07 2012 +0400 @@ -1303,7 +1303,7 @@ timestamp_str = helpers.from_one_line(timestamp_str) format_ += timestamp_str tim_format = time.strftime(format_, tim) - if locale.getpreferredencoding() != 'KOI8-R': + if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'): # if tim_format comes as unicode because of day_str. # we convert it to the encoding that we want (and that is utf-8) tim_format = helpers.ensure_utf8_string(tim_format)

1 0

gajim: get right info in file_props when we receive a request fo...
by Jefry Lagrange 02 Sep '12

02 Sep '12

changeset 4d141800e2e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4d141800e2e6 description: get right info in file_props when we receive a request for a file diffstat: src/common/connection_handlers_events.py | 9 +++++++-- src/common/jingle_content.py | 1 + src/common/jingle_ft.py | 1 + src/common/jingle_session.py | 7 +++++-- src/common/protocol/bytestream.py | 2 -- 5 files changed, 14 insertions(+), 6 deletions(-) diffs (90 lines): diff -r eea68291f2c0 -r 4d141800e2e6 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Sep 01 20:42:57 2012 +0200 +++ b/src/common/connection_handlers_events.py Sun Sep 02 12:59:55 2012 -0400 @@ -1996,8 +1996,13 @@ desc = self.jingle_content.getTag('description') if desc.getTag('offer'): file_tag = desc.getTag('offer').getTag('file') + self.file_props.sender = self.fjid + self.file_props.receiver = self.conn._ft_get_our_jid() else: file_tag = desc.getTag('request').getTag('file') + self.file_props.sender = self.conn._ft_get_our_jid() + self.file_props.receiver = self.fjid + self.file_props.type_ = 's' for child in file_tag.getChildren(): name = child.getName() val = child.getData() @@ -2050,12 +2055,12 @@ mime_type = si.getAttr('mime-type') if mime_type is not None: self.file_props.mime_type = mime_type - self.file_props.sender = self.fjid + self.file_props.sender = self.fjid + self.file_props.receiver = self.conn._ft_get_our_jid() self.file_props.request_id = self.id_ file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: self.file_props.desc = file_desc_tag.getData() - self.file_props.receiver = self.conn._ft_get_our_jid() self.file_props.transfered_size = [] return True diff -r eea68291f2c0 -r 4d141800e2e6 src/common/jingle_content.py --- a/src/common/jingle_content.py Sat Sep 01 20:42:57 2012 +0200 +++ b/src/common/jingle_content.py Sun Sep 02 12:59:55 2012 -0400 @@ -195,6 +195,7 @@ h = self._calcHash() file_tag.addChild(node=h) file_info = {'name' : self.file_props.name, + 'file-name' : self.file_props.file_name, 'hash' : self.file_props.hash_, 'size' : self.file_props.size, 'date' : self.file_props.date diff -r eea68291f2c0 -r 4d141800e2e6 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Sep 01 20:42:57 2012 +0200 +++ b/src/common/jingle_ft.py Sun Sep 02 12:59:55 2012 -0400 @@ -128,6 +128,7 @@ checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) self.session.__session_info(checksum ) file_info = {'name' : self.file_props.name, + 'file-name' : self.file_props.file_name, 'hash' : self.file_props.hash_, 'size' : self.file_props.size, 'date' : self.file_props.date diff -r eea68291f2c0 -r 4d141800e2e6 src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Sep 01 20:42:57 2012 +0200 +++ b/src/common/jingle_session.py Sun Sep 02 12:59:55 2012 -0400 @@ -522,8 +522,11 @@ file_info = self.connection.get_files_info(hash_=h) elif n: file_info = self.connection.get_files_info(name=n) - if not file_info: - # Send 404 error? + if file_info: + file_props = FilesProp.getFileProp(self.connection.name, + self.sid) + file_props.file_name = file_info['file-name'] + else: log.warning('The peer ' + self.peerjid + \ ' is requesting a ' + \ 'file that we dont have') diff -r eea68291f2c0 -r 4d141800e2e6 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Sep 01 20:42:57 2012 +0200 +++ b/src/common/protocol/bytestream.py Sun Sep 02 12:59:55 2012 -0400 @@ -32,7 +32,6 @@ import base64 import gobject import time -import pdb from common import xmpp from common import gajim @@ -838,7 +837,6 @@ Send next portion of data if it is time to do it. Used internally. """ log.debug('SendHandler called') - #pdb.set_trace() for file_props in FilesProp.getAllFileProp(): if not file_props.direction: # it's socks5 bytestream

1 0

gajim: remove old comment. Audio works with pidgin.
by Yann Leboulanger 01 Sep '12

01 Sep '12

changeset eea68291f2c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eea68291f2c0 description: remove old comment. Audio works with pidgin. diffstat: src/common/jingle.py | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diffs (39 lines): diff -r 38edd297f659 -r eea68291f2c0 src/common/jingle.py --- a/src/common/jingle.py Fri Aug 31 13:54:40 2012 -0400 +++ b/src/common/jingle.py Sat Sep 01 20:42:57 2012 +0200 @@ -26,10 +26,6 @@ # * config: # - codecs -# * figure out why it doesn't work with pidgin: -# That's maybe a bug in pidgin: -# http://xmpp.org/extensions/xep-0176.html#protocol-checks - import xmpp import helpers import gajim @@ -159,13 +155,13 @@ transport = JingleTransportIBB() c = JingleFileTransfer(jingle, transport=transport, file_props=file_props, use_security=use_security) - file_props.algo = self.__hash_support(contact) + file_props.algo = self.__hash_support(contact) jingle.add_content('file' + helpers.get_random_string_16(), c) jingle.start_session() return c.transport.sid def __hash_support(self, contact): - + if contact.supports(xmpp.NS_HASHES): if contact.supports(xmpp.NS_HASHES_MD5): return 'md5' @@ -175,7 +171,7 @@ return 'sha-256' elif contact.supports(xmpp.NS_HASHES_SHA512): return 'sha-512' - + return None def iter_jingle_sessions(self, jid, sid=None, media=None):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2012