Commits February 2013

commits@gajim.org

3 participants
86 discussions

gajim: check that contacts are not in "not in roster" group when...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset ee560e03f717 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ee560e03f717 description: check that contacts are not in "not in roster" group when we receive a RIE stanza. Fixes #7289 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b96e123c4fda -r ee560e03f717 src/dialogs.py --- a/src/dialogs.py Sun Feb 10 18:57:25 2013 +0100 +++ b/src/dialogs.py Tue Feb 12 19:31:35 2013 +0100 @@ -3417,7 +3417,7 @@ is_in_roster = True contact = gajim.contacts.get_contact_with_highest_priority( self.account, jid) - if not contact: + if not contact or _('Not in Roster') in contact.groups: is_in_roster = False name = self.exchange_list[jid][0] num_list = len(self.exchange_list[jid][1])

1 0

gajim: send RIE stanza as an IQ if user is online and supports R...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset b96e123c4fda in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b96e123c4fda description: send RIE stanza as an IQ if user is online and supports RIE. Fixes #7289 diffstat: src/common/connection.py | 26 +++++++++++++++----------- src/roster_window.py | 9 +++++++-- 2 files changed, 22 insertions(+), 13 deletions(-) diffs (71 lines): diff -r 079bdca0fa91 -r b96e123c4fda src/common/connection.py --- a/src/common/connection.py Sun Feb 10 11:29:14 2013 +0100 +++ b/src/common/connection.py Sun Feb 10 18:57:25 2013 +0100 @@ -1883,26 +1883,30 @@ form_node=obj.form_node, original_message=obj.original_message, delayed=obj.delayed, callback=cb) - def send_contacts(self, contacts, jid): + def send_contacts(self, contacts, jid, fjid, type_='message'): """ Send contacts with RosterX (Xep-0144) """ if not gajim.account_is_connected(self.name): return - if len(contacts) == 1: - msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), + if type_ == 'message': + if len(contacts) == 1: + msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), contacts[0].get_shown_name()) - else: - msg = _('Sent contacts:') - for contact in contacts: - msg += '\n "%s" (%s)' % (contact.get_full_jid(), + else: + msg = _('Sent contacts:') + for contact in contacts: + msg += '\n "%s" (%s)' % (contact.get_full_jid(), contact.get_shown_name()) - msg_iq = common.xmpp.Message(to=jid, body=msg) - x = msg_iq.addChild(name='x', namespace=common.xmpp.NS_ROSTERX) + stanza = common.xmpp.Message(to=gajim.get_jid_without_resource(fjid), + body=msg) + elif type_ == 'iq': + stanza = nbxmpp.Iq(to=fjid, typ='set') + x = stanza.addChild(name='x', namespace=common.xmpp.NS_ROSTERX) for contact in contacts: x.addChild(name='item', attrs={'action': 'add', 'jid': contact.jid, - 'name': contact.get_shown_name()}) - self.connection.send(msg_iq) + 'name': contact.get_shown_name()}) + self.connection.send(stanza) def send_stanza(self, stanza): """ diff -r 079bdca0fa91 -r b96e123c4fda src/roster_window.py --- a/src/roster_window.py Sun Feb 10 11:29:14 2013 +0100 +++ b/src/roster_window.py Sun Feb 10 18:57:25 2013 +0100 @@ -70,7 +70,7 @@ if dbus_support.supported: import dbus -from common.xmpp.protocol import NS_FILE +from common.xmpp.protocol import NS_FILE, NS_ROSTERX from common.pep import MOODS, ACTIVITIES #(icon, name, type, jid, account, editable, second pixbuf) @@ -4472,7 +4472,12 @@ def on_drop_rosterx(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): - gajim.connections[account_dest].send_contacts([c_source], c_dest.jid) + type_ = 'message' + if c_dest.show not in ('offline', 'error') and c_dest.supports( + NS_ROSTERX): + type_ = 'iq' + gajim.connections[account_dest].send_contacts([c_source], + c_dest.get_full_jid(), type_=type_) def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime):

1 0

gajim: don't crash when cacerts.pem file doesn't exists
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 079bdca0fa91 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=079bdca0fa91 description: don't crash when cacerts.pem file doesn't exists diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 15732f100316 -r 079bdca0fa91 src/common/connection.py --- a/src/common/connection.py Tue Jan 22 17:38:43 2013 +0100 +++ b/src/common/connection.py Sun Feb 10 11:29:14 2013 +0100 @@ -1171,6 +1171,8 @@ port = self._current_host['port'] cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem') + if not os.path.exists(cacerts): + cacerts = '' mycerts = common.gajim.MY_CACERTS secure_tuple = (self._current_type, cacerts, mycerts)

1 0

gajim: don't try to escape JID when we get a subscription reques...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 15732f100316 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=15732f100316 description: don't try to escape JID when we get a subscription request from it, it's already escaped. Fixes #7277 diffstat: src/dialogs.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (28 lines): diff -r d38258788343 -r 15732f100316 src/dialogs.py --- a/src/dialogs.py Sun Jan 20 19:55:35 2013 +0100 +++ b/src/dialogs.py Tue Jan 22 17:38:43 2013 +0100 @@ -946,6 +946,7 @@ liststore = gtk.ListStore(str) self.protocol_jid_combobox.set_model(liststore) if jid: + self.jid_escaped = True type_ = gajim.get_transport_name_from_jid(jid) if not type_: type_ = 'jabber' @@ -980,6 +981,7 @@ self.nickname_entry.set_text(user_nick) self.nickname_entry.grab_focus() else: + self.jid_escaped = False self.uid_entry.grab_focus() group_names = [] for acct in accounts: @@ -1054,7 +1056,7 @@ model = self.protocol_combobox.get_model() iter_ = self.protocol_combobox.get_active_iter() type_ = model[iter_][2] - if type_ != 'jabber': + if type_ != 'jabber' and not self.jid_escaped: transport = self.protocol_jid_combobox.get_active_text().decode( 'utf-8') if self.account:

1 0

gajim: fix typo
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset d38258788343 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d38258788343 description: fix typo diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5da549dca32f -r d38258788343 src/roster_window.py --- a/src/roster_window.py Mon Jan 14 20:18:55 2013 +0100 +++ b/src/roster_window.py Sun Jan 20 19:55:35 2013 +0100 @@ -2668,7 +2668,7 @@ def _nec_decrypted_message_received(self, obj): if not obj.msgtxt: # empty message text return True - if obj.mtype not in ('norml', 'chat'): + if obj.mtype not in ('normal', 'chat'): return if obj.session.control: typ = ''

1 0

gajim: [Daniel Aleksandersen] Use encrypted Google search. Fixes...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 5474cb355489 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5474cb355489 description: [Daniel Aleksandersen] Use encrypted Google search. Fixes #7289 diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 77c663e9c7c2 -r 5474cb355489 src/common/config.py --- a/src/common/config.py Sun Jan 06 15:11:34 2013 +0100 +++ b/src/common/config.py Mon Jan 14 20:13:45 2013 +0100 @@ -177,7 +177,7 @@ 'last_roster_visible': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')], 'version': [ opt_str, defs.version ], # which version created the config - 'search_engine': [opt_str, 'http://www.google.com/search?&q=%s&sourceid=gajim'], + 'search_engine': [opt_str, 'https://www.google.com/search?&q=%s&sourceid=gajim'], 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True],

1 0

gajim: fix registering new account
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 77c663e9c7c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=77c663e9c7c2 description: fix registering new account diffstat: src/common/connection_handlers_events.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diffs (29 lines): diff -r 9259a37991c0 -r 77c663e9c7c2 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Jan 04 09:46:13 2013 +0100 +++ b/src/common/connection_handlers_events.py Sun Jan 06 15:11:34 2013 +0100 @@ -1523,17 +1523,18 @@ try: self.errnum = self.conn.connection.Connection.ssl_errnum except AttributeError: - self.errnum = -1 # we don't have an errnum + self.errnum = [] # we don't have an errnum self.ssl_msg = '' - if self.errnum > 0: - from common.connection import ssl_error - self.ssl_msg = ssl_error.get(self.errnum, _( - 'Unknown SSL error: %d') % self.errnum) + for er in self.errnum: + if er > 0: + from common.connection import ssl_error + self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ + er) self.ssl_cert = '' - if hasattr(self.conn.connection.Connection, 'ssl_cert_pem'): + if len(self.conn.connection.Connection.ssl_cert_pem): self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_fingerprint = '' - if hasattr(self.conn.connection.Connection, 'ssl_fingerprint_sha1'): + if len(self.conn.connection.Connection.ssl_fingerprint_sha1): self.ssl_fingerprint = \ self.conn.connection.Connection.ssl_fingerprint_sha1 return True

1 0

gajim: fix order of farstream calls
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset fddbb95cd0c7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fddbb95cd0c7 description: fix order of farstream calls diffstat: src/common/jingle_rtp.py | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diffs (40 lines): diff -r 2c5064a2a9f5 -r fddbb95cd0c7 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Wed Dec 26 18:41:31 2012 -0400 +++ b/src/common/jingle_rtp.py Sun Dec 30 16:20:57 2012 +0100 @@ -177,6 +177,15 @@ elif name == 'farstream-codecs-changed': if self.sent and self.p2psession.get_property('codecs'): self.send_description_info() + if self.transport.remote_candidates: + # those lines MUST be done after we get info on our + # codecs + self.p2pstream.add_remote_candidates( + self.transport.remote_candidates) + self.transport.remote_candidates = [] + self.p2pstream.set_property('direction', + farstream.DIRECTION_BOTH) + elif name == 'farstream-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): @@ -234,11 +243,15 @@ def on_negotiated(self): if self.accepted: - if self.transport.remote_candidates: - self.p2pstream.add_remote_candidates(self.transport.remote_candidates) - self.transport.remote_candidates = [] - # TODO: farstream.DIRECTION_BOTH only if senders='both' - self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH) + if self.p2psession.get_property('codecs'): + # those lines MUST be done after we get info on our codecs + if self.transport.remote_candidates: + self.p2pstream.add_remote_candidates( + self.transport.remote_candidates) + self.transport.remote_candidates = [] + # TODO: farstream.DIRECTION_BOTH only if senders='both' + self.p2pstream.set_property('direction', + farstream.DIRECTION_BOTH) JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action):

1 0

gajim: fix showing dialpad correctly in LTR languages. Fixes #7285
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 9259a37991c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9259a37991c0 description: fix showing dialpad correctly in LTR languages. Fixes #7285 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r fddbb95cd0c7 -r 9259a37991c0 src/chat_control.py --- a/src/chat_control.py Sun Dec 30 16:20:57 2012 +0100 +++ b/src/chat_control.py Fri Jan 04 09:46:13 2013 +0100 @@ -1581,6 +1581,7 @@ self.handlers[id_] = widget self.dtmf_window = self.xml.get_object('dtmf_window') + self.dtmf_window.get_child().set_direction(gtk.TEXT_DIR_LTR) id_ = self.dtmf_window.connect('focus-out-event', self.on_dtmf_window_focus_out_event) self.handlers[id_] = self.dtmf_window

1 0

gajim: Cancel an IBB transfer
by Jefry Lagrange 13 Feb '13

13 Feb '13

changeset 2c5064a2a9f5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c5064a2a9f5 description: Cancel an IBB transfer diffstat: src/common/protocol/bytestream.py | 21 ++++++++++++++++++++- src/filetransfers_window.py | 6 +++++- 2 files changed, 25 insertions(+), 2 deletions(-) diffs (69 lines): diff -r 56c9cc2925c9 -r 2c5064a2a9f5 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/common/protocol/bytestream.py Wed Dec 26 18:41:31 2012 -0400 @@ -794,6 +794,16 @@ file_props['fp'] = open(file_props['file-name'], 'w') conn.send(rep) + def CloseIBBStream(self, file_props): + file_props.connected = False + file_props.fp.close() + file_props.stopped = True + self.connection.send(nbxmpp.Protocol('iq', + file_props.direction[1:], 'set', + payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', + {'sid':file_props.sid})])) + + def OpenStream(self, sid, to, fp, blocksize=4096): """ Start new stream. You should provide stream id 'sid', the endpoind jid @@ -842,6 +852,9 @@ if file_props['direction'][0] == '>': if 'paused' in file_props and file_props['paused']: continue + if 'connected' in file_props and file_props['connected']: + #TODO: Reply with out of order error + continue chunk = file_props['fp'].read(file_props['block-size']) if chunk: datanode = xmpp.Node(xmpp.NS_IBB + ' data', {'sid': sid, @@ -934,6 +947,10 @@ file_props = gajim.socks5queue.get_file_props(self.name, sid) conn.send(stanza.buildReply('result')) file_props['fp'].close() + file_props['completed'] = file_props['received_len'] >= \ + file_props['size'] + if not file_props['completed']: + file_props['error'] = -1 gajim.socks5queue.complete_transfer_cb(self.name, file_props) gajim.socks5queue.remove_file_props(self.name, sid) else: @@ -950,8 +967,10 @@ log.debug('IBBAllIqHandler called syn_id->%s' % syn_id) for sid in self.files_props.keys(): file_props = self.files_props[sid] - if not 'direction' in file_props: + if not 'direction' in file_props or not 'connected' in file_props \ + or not file_props['connected']: # It's socks5 bytestream + # Or we closed the IBB stream continue if file_props['syn_id'] == syn_id: if stanza.getType() == 'error': diff -r 56c9cc2925c9 -r 2c5064a2a9f5 src/filetransfers_window.py --- a/src/filetransfers_window.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/filetransfers_window.py Wed Dec 26 18:41:31 2012 -0400 @@ -848,7 +848,11 @@ account = file_props['tt_account'] if account not in gajim.connections: return - gajim.connections[account].disconnect_transfer(file_props) + con = gajim.connections[account] + # Check if we are in a IBB transfer + if 'direction' in file_props and file_props['direction']: + con.CloseIBBStream(file_props) + con.disconnect_transfer(file_props) self.set_status(file_props['type'], file_props['sid'], 'stop') def show_tooltip(self, widget):

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013