Commits

commits@gajim.org

17632 discussions

gajim: add herew to the list of language ictionnaries
by Yann Leboulanger 06 Sep '12

06 Sep '12

changeset a1b03412a1cd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1b03412a1cd description: add herew to the list of language ictionnaries diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 79d34aeb9b36 -r a1b03412a1cd src/chat_control.py --- a/src/chat_control.py Wed Sep 05 19:39:07 2012 -0400 +++ b/src/chat_control.py Thu Sep 06 18:41:30 2012 +0200 @@ -91,7 +91,7 @@ _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', - _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} + _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN', _('Hebrew'): 'he'} if gajim.config.get('use_speller') and HAS_GTK_SPELL: # loop removing non-existent dictionaries

1 0

gajim: send session-accept for file request
by Jefry Lagrange 05 Sep '12

05 Sep '12

changeset 79d34aeb9b36 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79d34aeb9b36 description: send session-accept for file request diffstat: src/common/connection_handlers_events.py | 7 +++++++ src/common/jingle_ft.py | 5 +++++ src/common/jingle_session.py | 8 +++----- 3 files changed, 15 insertions(+), 5 deletions(-) diffs (70 lines): diff -r 3b91071c9876 -r 79d34aeb9b36 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Sep 05 10:59:59 2012 +0400 +++ b/src/common/connection_handlers_events.py Wed Sep 05 19:39:07 2012 -0400 @@ -2000,6 +2000,13 @@ self.file_props.receiver = self.conn._ft_get_our_jid() else: file_tag = desc.getTag('request').getTag('file') + h = file_tag.getTag('hash') + n = file_tag.getTag('name') + if h: + file_info = self.conn.get_files_info(hash_=h) + elif n: + file_info = self.conn.get_files_info(name=n) + self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.receiver = self.fjid self.file_props.type_ = 's' diff -r 3b91071c9876 -r 79d34aeb9b36 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Sep 05 10:59:59 2012 +0400 +++ b/src/common/jingle_ft.py Wed Sep 05 19:39:07 2012 -0400 @@ -47,6 +47,7 @@ class JingleFileTransfer(JingleContent): + def __init__(self, session, transport=None, file_props=None, use_security=False): JingleContent.__init__(self, session, transport) @@ -117,6 +118,10 @@ gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self.session.connection, stanza=stanza, jingle_content=content, FT_content=self)) + if self.session.request: + # accept the request + self.session.approve_content(self.media, self.name) + self.session.accept_session() def __on_session_initiate_sent(self, stanza, content, error, action): pass diff -r 3b91071c9876 -r 79d34aeb9b36 src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Sep 05 10:59:59 2012 +0400 +++ b/src/common/jingle_session.py Wed Sep 05 19:39:07 2012 -0400 @@ -86,6 +86,7 @@ self.weinitiate = weinitiate # Are we requesting or offering a file? self.werequest = werequest + self.request = False # what state is session in? (one from JingleStates) self.state = JingleStates.ended if not sid: @@ -516,17 +517,14 @@ request = \ jingle.getTag('content').getTag('description').getTag('request') if request: + self.request = True h = request.getTag('file').getTag('hash') n = request.getTag('file').getTag('name') if h: file_info = self.connection.get_files_info(hash_=h) elif n: file_info = self.connection.get_files_info(name=n) - if file_info: - file_props = FilesProp.getFileProp(self.connection.name, - self.sid) - file_props.file_name = file_info['file-name'] - else: + if not file_info: log.warning('The peer ' + self.peerjid + \ ' is requesting a ' + \ 'file that we dont have')

1 0

gajim: typo
by Fomin Denis 05 Sep '12

05 Sep '12

changeset 3b91071c9876 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b91071c9876 description: typo diffstat: src/session.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r c1103a8737dc -r 3b91071c9876 src/session.py --- a/src/session.py Mon Sep 03 22:02:07 2012 +0400 +++ b/src/session.py Wed Sep 05 10:59:59 2012 +0400 @@ -103,8 +103,8 @@ 'or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH gajim.nec.push_incoming_event(InformationEvent(None, - conn=self.conn, level='error', pri_txt=pritxt, - sec_txt=sectxt)) + conn=self.conn, level='error', pri_txt=pritext, + sec_txt=sectext)) treat_as = gajim.config.get('treat_incoming_messages') if treat_as:

1 0

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

gajim: send modification date of file being transfered
by Jefry Lagrange 31 Aug '12

31 Aug '12

changeset 38edd297f659 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=38edd297f659 description: send modification date of file being transfered diffstat: src/common/jingle_content.py | 4 ++++ src/filetransfers_window.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diffs (49 lines): diff -r 3b38c7493c92 -r 38edd297f659 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Aug 31 13:42:44 2012 +0200 +++ b/src/common/jingle_content.py Fri Aug 31 13:54:40 2012 -0400 @@ -174,6 +174,10 @@ node = xmpp.simplexml.Node(tag='name') node.addData(self.file_props.name) file_tag.addChild(node=node) + if self.file_props.date: + node = xmpp.simplexml.Node(tag='date') + node.addData(self.file_props.date) + file_tag.addChild(node=node) if self.file_props.size: node = xmpp.simplexml.Node(tag='size') node.addData(self.file_props.size) diff -r 3b38c7493c92 -r 38edd297f659 src/filetransfers_window.py --- a/src/filetransfers_window.py Fri Aug 31 13:42:44 2012 +0200 +++ b/src/filetransfers_window.py Fri Aug 31 13:54:40 2012 -0400 @@ -664,10 +664,19 @@ return iter_ iter_ = self.model.iter_next(iter_) + def __convert_date(self, epoch): + # Converts date-time from seconds from epoch to iso 8601 + import time, datetime + ts = time.gmtime(epoch) + dt = datetime.datetime(ts.tm_year, ts.tm_mon, ts.tm_mday, ts.tm_hour, + ts.tm_min, ts.tm_sec) + return dt.isoformat() + def get_send_file_props(self, account, contact, file_path, file_name, file_desc=''): """ - Create new file_props dict and set initial file transfer properties in it + Create new file_props object and set initial file transfer + properties in it """ if os.path.isfile(file_path): stat = os.stat(file_path) @@ -680,8 +689,10 @@ return None file_props = FilesProp.getNewFileProp(account, sid=helpers.get_random_string_16()) + mod_date = os.path.getmtime(file_path) file_props.file_name = file_path file_props.name = file_name + file_props.date = self.__convert_date(mod_date) file_props.type_ = 's' file_props.desc = file_desc file_props.elapsed_time = 0

1 0

gajim: add an id to jingle ICE UDP transports
by Yann Leboulanger 31 Aug '12

31 Aug '12

changeset 3b38c7493c92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b38c7493c92 description: add an id to jingle ICE UDP transports diffstat: src/common/gajim.py | 6 ++++++ src/common/jingle_transport.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diffs (36 lines): diff -r 0d137d5012e6 -r 3b38c7493c92 src/common/gajim.py --- a/src/common/gajim.py Fri Aug 31 15:42:25 2012 +0400 +++ b/src/common/gajim.py Fri Aug 31 13:42:44 2012 +0200 @@ -222,6 +222,12 @@ import caps_cache caps_cache.initialize(logger) +global_id = 0 +def get_an_id(): + global global_id + global_id += 1 + return global_id + def get_nick_from_jid(jid): pos = jid.find('@') return jid[:pos] diff -r 0d137d5012e6 -r 3b38c7493c92 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Fri Aug 31 15:42:25 2012 +0400 +++ b/src/common/jingle_transport.py Fri Aug 31 13:42:44 2012 +0200 @@ -178,7 +178,7 @@ local_ip_cand = [] port = int(gajim.config.get('file_transfers_port')) #type preference of connection type. XEP-0260 section 2.2 - type_preference = 126 + type_preference = 126 c = {'host': self.connection.peerhost[0]} c['candidate_id'] = self.connection.connection.getAnID() c['port'] = port @@ -351,6 +351,7 @@ 'network': '0', 'port': candidate.port, 'priority': int(candidate.priority), # hack + 'id': gajim.get_an_id() } if candidate.type in types: attrs['type'] = types[candidate.type]

1 0

gajim: don't resize empty and animation icon.Fixes #7225
by Fomin Denis 31 Aug '12

31 Aug '12

changeset 0d137d5012e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0d137d5012e6 description: don't resize empty and animation icon.Fixes #7225 diffstat: src/gtkgui_helpers.py | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diffs (50 lines): diff -r a4fe5b28e9e0 -r 0d137d5012e6 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Aug 31 11:46:45 2012 +0200 +++ b/src/gtkgui_helpers.py Fri Aug 31 15:42:25 2012 +0400 @@ -1042,6 +1042,13 @@ iconset = gajim.config.DEFAULT_ICONSET gajim.config.set('iconset', iconset) + path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + gajim.interface.jabber_state_images['16'] = load_iconset(path) + + pixo, pixc = load_icons_meta() + gajim.interface.jabber_state_images['opened'] = load_iconset(path, pixo) + gajim.interface.jabber_state_images['closed'] = load_iconset(path, pixc) + path = os.path.join(helpers.get_iconset_path(iconset), '32x32') gajim.interface.jabber_state_images['32'] = load_iconset(path) @@ -1052,18 +1059,23 @@ # Resize 32x32 icons to 24x24 for each in gajim.interface.jabber_state_images['32']: img = gtk.Image() - pix = gajim.interface.jabber_state_images['32'][each].get_pixbuf() - scaled_pix = pix.scale_simple(24, 24, gtk.gdk.INTERP_BILINEAR) + pix = gajim.interface.jabber_state_images['32'][each] + pix_type = pix.get_storage_type() + if pix_type == gtk.IMAGE_ANIMATION: + animation = pix.get_animation() + pixbuf = animation.get_static_image() + elif pix_type == gtk.IMAGE_EMPTY: + pix = gajim.interface.jabber_state_images['16'][each] + pix_16_type = pix.get_storage_type() + if pix_16_type == gtk.IMAGE_ANIMATION: + animation = pix.get_animation() + pixbuf = animation.get_static_image() + else: + pixbuf = pix.get_pixbuf() + scaled_pix = pixbuf.scale_simple(24, 24, gtk.gdk.INTERP_BILINEAR) img.set_from_pixbuf(scaled_pix) gajim.interface.jabber_state_images['24'][each] = img - path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - gajim.interface.jabber_state_images['16'] = load_iconset(path) - - pixo, pixc = load_icons_meta() - gajim.interface.jabber_state_images['opened'] = load_iconset(path, pixo) - gajim.interface.jabber_state_images['closed'] = load_iconset(path, pixc) - def reload_jabber_state_images(): make_jabber_state_images() gajim.interface.roster.update_jabber_state_images()

1 0

gajim: fix missing part of the commit. Fixes #7225
by Yann Leboulanger 31 Aug '12

31 Aug '12

changeset a4fe5b28e9e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a4fe5b28e9e0 description: fix missing part of the commit. Fixes #7225 diffstat: src/gtkgui_helpers.py | 1 - src/gui_interface.py | 6 +++--- src/statusicon.py | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diffs (46 lines): diff -r 0ded48e58747 -r a4fe5b28e9e0 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Aug 31 09:54:32 2012 +0200 +++ b/src/gtkgui_helpers.py Fri Aug 31 11:46:45 2012 +0200 @@ -1049,7 +1049,6 @@ if (os.path.exists(path)): gajim.interface.jabber_state_images['24'] = load_iconset(path) else: - gajim.interface.jabber_state_images['24'] = {} # Resize 32x32 icons to 24x24 for each in gajim.interface.jabber_state_images['32']: img = gtk.Image() diff -r 0ded48e58747 -r a4fe5b28e9e0 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 31 09:54:32 2012 +0200 +++ b/src/gui_interface.py Fri Aug 31 11:46:45 2012 +0200 @@ -916,7 +916,7 @@ request = obj.stanza.getTag('jingle').getTag('content')\ .getTag('description').getTag('request') if request: - # If we get a request instead + # If we get a request instead return contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid) if helpers.allow_popup_window(account): @@ -2675,8 +2675,8 @@ gajim.thread_interface = ThreadInterface # This is the manager and factory of message windows set by the module self.msg_win_mgr = None - self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, - 'closed': {}} + self.jabber_state_images = {'16': {}, '24': {}, '32': {}, 'opened': {}, + 'closed': {}} self.emoticons_menu = None # handler when an emoticon is clicked in emoticons_menu self.emoticon_menuitem_clicked = None diff -r 0ded48e58747 -r a4fe5b28e9e0 src/statusicon.py --- a/src/statusicon.py Fri Aug 31 09:54:32 2012 +0200 +++ b/src/statusicon.py Fri Aug 31 11:46:45 2012 +0200 @@ -118,6 +118,8 @@ def on_status_icon_size_changed(self, statusicon, size): if size > 31: self.statusicon_size = '32' + elif size > 23: + self.statusicon_size = '24' else: self.statusicon_size = '16' if os.environ.get('KDE_FULL_SESSION') == 'true':

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