Commits August 2012

commits@gajim.org

3 participants
152 discussions

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

gajim: add 24x24 icons. Take them from 32x32 if they don't exist...
by Yann Leboulanger 31 Aug '12

31 Aug '12

changeset 0ded48e58747 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ded48e58747 description: add 24x24 icons. Take them from 32x32 if they don't exist in the iconset. Fixes #7225 diffstat: src/gtkgui_helpers.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diffs (23 lines): diff -r 04cebaf21e27 -r 0ded48e58747 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Thu Aug 30 23:57:20 2012 -0400 +++ b/src/gtkgui_helpers.py Fri Aug 31 09:54:32 2012 +0200 @@ -1045,6 +1045,19 @@ path = os.path.join(helpers.get_iconset_path(iconset), '32x32') gajim.interface.jabber_state_images['32'] = load_iconset(path) + path = os.path.join(helpers.get_iconset_path(iconset), '24x24') + 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() + pix = gajim.interface.jabber_state_images['32'][each].get_pixbuf() + scaled_pix = pix.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)

1 0

gajim: dont alert the user if we get a request for a file
by Jefry Lagrange 31 Aug '12

31 Aug '12

changeset 04cebaf21e27 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=04cebaf21e27 description: dont alert the user if we get a request for a file diffstat: src/gui_interface.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (25 lines): diff -r fae61de0a291 -r 04cebaf21e27 src/gui_interface.py --- a/src/gui_interface.py Thu Aug 30 23:09:23 2012 -0400 +++ b/src/gui_interface.py Thu Aug 30 23:57:20 2012 -0400 @@ -912,15 +912,18 @@ account=account, keyID=keyID) gajim.contacts.add_contact(account, contact) self.roster.add_contact(obj.jid, account) + if obj.file_props.session_type == 'jingle': + request = obj.stanza.getTag('jingle').getTag('content')\ + .getTag('description').getTag('request') + if request: + # If we get a request instead + return contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid) - if helpers.allow_popup_window(account): self.instances['file_transfers'].show_file_request(account, contact, obj.file_props) return - self.add_event(account, obj.jid, 'file-request', obj.file_props) - if helpers.allow_showing_notification(account): path = gtkgui_helpers.get_icon_path('gajim-ft_request', 48) txt = _('%s wants to send you a file.') % gajim.get_name_from_jid(

1 0

gajim: refactoring
by Jefry Lagrange 31 Aug '12

31 Aug '12

changeset fae61de0a291 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fae61de0a291 description: refactoring diffstat: src/common/connection_handlers_events.py | 31 ++++++++++--------------------- src/common/jingle_session.py | 5 +++-- 2 files changed, 13 insertions(+), 23 deletions(-) diffs (87 lines): diff -r ca551b3a2237 -r fae61de0a291 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 30 23:46:19 2012 +0200 +++ b/src/common/connection_handlers_events.py Thu Aug 30 23:09:23 2012 -0400 @@ -1986,23 +1986,11 @@ self.file_props.transport_sid = self.FT_content.transport.sid self.FT_content.file_props = self.file_props self.FT_content.transport.set_file_props(self.file_props) - if self.file_props.streamhosts: - self.file_props.streamhosts.extend( + self.file_props.streamhosts.extend( self.FT_content.transport.remote_candidates) - else: - self.file_props.streamhosts = \ - self.FT_content.transport.remote_candidates for host in self.file_props.streamhosts: host['initiator'] = self.FT_content.session.initiator host['target'] = self.FT_content.session.responder - else: - si = self.stanza.getTag('si') - self.file_props = FilesProp.getNewFileProp(self.conn.name, - unicode(si.getAttr('id')) - ) - self.file_props.sender = self.fjid - self.file_props.request_id = self.id_ - if self.jingle_content: self.file_props.session_type = 'jingle' self.file_props.stream_methods = xmpp.NS_BYTESTREAM desc = self.jingle_content.getTag('description') @@ -2024,8 +2012,11 @@ self.file_props.hash_ = val if name == 'date': self.file_props.date = val - else: + si = self.stanza.getTag('si') + self.file_props = FilesProp.getNewFileProp(self.conn.name, + unicode(si.getAttr('id')) + ) profile = si.getAttr('profile') if profile != xmpp.NS_FILE: self.conn.send_file_rejection(self.file_props, code='400', @@ -2056,18 +2047,16 @@ self.file_props.name = val if name == 'size': self.file_props.size = val + 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.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() - - if not self.jingle_content: - mime_type = si.getAttr('mime-type') - if mime_type is not None: - self.file_props.mime_type = mime_type - self.file_props.receiver = self.conn._ft_get_our_jid() self.file_props.transfered_size = [] - return True class FileRequestErrorEvent(nec.NetworkIncomingEvent): diff -r ca551b3a2237 -r fae61de0a291 src/common/jingle_session.py --- a/src/common/jingle_session.py Thu Aug 30 23:46:19 2012 +0200 +++ b/src/common/jingle_session.py Thu Aug 30 23:09:23 2012 -0400 @@ -335,8 +335,8 @@ action = 'iq-result' callables = self.callbacks[action] try: - for callable in callables: - callable(stanza=stanza, jingle=jingle, error=error, action=action) + for call in callables: + call(stanza=stanza, jingle=jingle, error=error, action=action) except xmpp.NodeProcessed: pass except TieBreak: @@ -528,6 +528,7 @@ ' is requesting a ' + \ 'file that we dont have') self.decline_session() + raise xmpp.NodeProcessed # If there's no content we understand... if not contents: # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate

1 0

gajim: fix fallback to IBB
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset ca551b3a2237 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca551b3a2237 description: fix fallback to IBB diffstat: src/common/jingle_ftstates.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 98b7d72727b2 -r ca551b3a2237 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Thu Aug 30 23:45:35 2012 +0200 +++ b/src/common/jingle_ftstates.py Thu Aug 30 23:46:19 2012 +0200 @@ -139,7 +139,7 @@ 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, + con.OpenStream( self.jft.file_props.sid, self.jft.session.peerjid, fp, blocksize=4096) def __start_SOCK5_transfer(self):

1 0

gajim: don't forget to send candidate-error when we get only a l...
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset 98b7d72727b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=98b7d72727b2 description: don't forget to send candidate-error when we get only a local IP diffstat: src/common/socks5.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 8e78dbd95821 -r 98b7d72727b2 src/common/socks5.py --- a/src/common/socks5.py Thu Aug 30 22:44:26 2012 +0200 +++ b/src/common/socks5.py Thu Aug 30 23:45:35 2012 +0200 @@ -118,14 +118,18 @@ file_props = FilesProp.getFileProp(account, sid) file_props.failure_cb = on_failure con = gajim.connections[account] - if not file_props.streamhosts: - on_failure(file_props.sid) - # add streamhosts to the queue + streamhosts_to_test = [] + # Remove local IPs to not connect to ourself for streamhost in file_props.streamhosts: if streamhost['host'] == '127.0.0.1' or \ streamhost['host'] == '::1' or \ streamhost['host'] == con.peerhost[0]: continue + streamhosts_to_test.append(streamhost) + if not streamhosts_to_test: + on_failure(file_props.sid) + # add streamhosts to the queue + for streamhost in streamhosts_to_test: if 'type' in streamhost and streamhost['type'] == 'proxy': fp = None else:

1 0

gajim: fix cleaning finished FT
by Yann Leboulanger 30 Aug '12

30 Aug '12

changeset 8e78dbd95821 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8e78dbd95821 description: fix cleaning finished FT diffstat: src/filetransfers_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e6ceaace4cc2 -r 8e78dbd95821 src/filetransfers_window.py --- a/src/filetransfers_window.py Thu Aug 30 11:09:39 2012 +0200 +++ b/src/filetransfers_window.py Thu Aug 30 22:44:26 2012 +0200 @@ -575,7 +575,7 @@ for ev_type in ('file-error', 'file-completed', 'file-request-error', 'file-send-error', 'file-stopped'): for event in gajim.events.get_events(account, jid, [ev_type]): - if event.parameters['sid'] == file_props.sid: + if event.parameters.sid == file_props.sid: gajim.events.remove_events(account, jid, event) gajim.interface.roster.draw_contact(jid, account) gajim.interface.roster.show_title()

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 August 2012