Commits November 2014

commits@gajim.org

1 participants
63 discussions

gajim: correctly get account name
by Gajim 14 Nov '14

14 Nov '14

changeset 7ff6503a0455 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7ff6503a0455 description: correctly get account name diffstat: src/common/protocol/bytestream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 431190e7f461 -r 7ff6503a0455 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Jun 01 15:42:06 2014 +0200 +++ b/src/common/protocol/bytestream.py Sun Jun 01 15:42:28 2014 +0200 @@ -269,7 +269,7 @@ profile = si.getAttr('profile') if profile != nbxmpp.NS_FILE: return - file_props = FilesProp.getFileProp(con.name, iq_obj.getAttr('id')) + file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id')) if not file_props: return jid = self._ft_get_from(iq_obj)

1 0

gajim: correctly search for contact when doing pm
by Gajim 14 Nov '14

14 Nov '14

changeset defa204ca64a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=defa204ca64a description: correctly search for contact when doing pm diffstat: src/common/connection.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 7ff6503a0455 -r defa204ca64a src/common/connection.py --- a/src/common/connection.py Sun Jun 01 15:42:28 2014 +0200 +++ b/src/common/connection.py Sun Jun 01 16:51:51 2014 +0200 @@ -463,7 +463,9 @@ msg_iq = iqs else: msg_iq.setTo(fjid) - r_ = resource or gajim.get_resource_from_jid(fjid) + r_ = resource + if not r_ and jid != fjid: # Only if we're not in a pm + r_ = gajim.get_resource_from_jid(fjid) if r_: contact = gajim.contacts.get_contact(self.name, jid, r_) else:

1 0

gajim: don't allow empty string in new chat dialog entry complet...
by Gajim 14 Nov '14

14 Nov '14

changeset bfcd83790200 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bfcd83790200 description: don't allow empty string in new chat dialog entry completion. Fixes #7760 diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r defa204ca64a -r bfcd83790200 src/common/helpers.py --- a/src/common/helpers.py Sun Jun 01 16:51:51 2014 +0200 +++ b/src/common/helpers.py Sun Jun 01 22:32:44 2014 +0200 @@ -655,7 +655,7 @@ del contacts_dict[name] contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1 contacts_dict['%s (%s)' % (name, jid)] = contact - else: + elif contact.name: if contact.name == gajim.get_nick_from_jid(jid): del contacts_dict[jid] contacts_dict[name] = contact

1 0

gajim: prevent some GTK3 warning
by Gajim 14 Nov '14

14 Nov '14

changeset ae93640b7612 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ae93640b7612 description: prevent some GTK3 warning diffstat: src/dialogs.py | 6 +++--- src/plugins/gui.py | 8 +++----- src/tooltips.py | 4 ---- 3 files changed, 6 insertions(+), 12 deletions(-) diffs (55 lines): diff -r a631e38063b4 -r ae93640b7612 src/dialogs.py --- a/src/dialogs.py Tue Nov 11 23:11:15 2014 +0100 +++ b/src/dialogs.py Fri Nov 14 09:35:39 2014 +0100 @@ -1420,9 +1420,9 @@ on_response_ok=None, on_response_cancel=None, on_response_yes=None, on_response_no=None): self.call_cancel_on_destroy = True - Gtk.MessageDialog.__init__(self, parent, - Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL, - type_, buttons, message_format = pritext) + Gtk.MessageDialog.__init__(self, parent=parent, + modal=True, destroy_with_parent=True, + message_type=type_, buttons=buttons, text=pritext) self.format_secondary_markup(sectext) diff -r a631e38063b4 -r ae93640b7612 src/plugins/gui.py --- a/src/plugins/gui.py Tue Nov 11 23:11:15 2014 +0100 +++ b/src/plugins/gui.py Fri Nov 14 09:35:39 2014 +0100 @@ -92,9 +92,7 @@ activatable=ACTIVATABLE) self.installed_plugins_treeview.append_column(col) - icon = Gtk.Image() - self.def_icon = icon.render_icon_pixbuf(Gtk.STOCK_PREFERENCES, - Gtk.IconSize.MENU) + self.def_icon = gtkgui_helpers.get_icon_pixmap('preferences-desktop') # connect signal for selection change selection = self.installed_plugins_treeview.get_selection() @@ -312,8 +310,8 @@ @log_calls('GajimPluginConfigDialog') def __init__(self, plugin, **kwargs): - Gtk.Dialog.__init__(self, '%s %s'%(plugin.name, _('Configuration')), - **kwargs) + Gtk.Dialog.__init__(self, title='%s %s'%(plugin.name, + _('Configuration')), **kwargs) self.plugin = plugin button = self.add_button('gtk-close', Gtk.ResponseType.CLOSE) button.connect('clicked', self.on_close_button_clicked) diff -r a631e38063b4 -r ae93640b7612 src/tooltips.py --- a/src/tooltips.py Tue Nov 11 23:11:15 2014 +0100 +++ b/src/tooltips.py Fri Nov 14 09:35:39 2014 +0100 @@ -447,10 +447,6 @@ def __init__(self): self.account = None - self.image = Gtk.Image() - self.image.set_alignment(0, 0) - # padding is independent of the total length and better than alignment - self.image.set_padding(1, 2) self.avatar_image = Gtk.Image() NotificationAreaTooltip.__init__(self)

1 0

gajim: Only Jingle RTP functions depend on Farstream library.
by Gajim 14 Nov '14

14 Nov '14

changeset 1f58815ed1f5 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1f58815ed1f5 description: Only Jingle RTP functions depend on Farstream library. Jingle File Transfers work without Farstream. ICE-UDP transport is also implemented as a part of Farstream (libnice) Fixes #7713 diffstat: src/common/helpers.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (27 lines): diff -r ae93640b7612 -r 1f58815ed1f5 src/common/helpers.py --- a/src/common/helpers.py Fri Nov 14 09:35:39 2014 +0100 +++ b/src/common/helpers.py Fri Apr 04 10:33:36 2014 +0200 @@ -1305,17 +1305,17 @@ gajim.gajim_optional_features[a].append(nbxmpp.NS_ESESSION) if gajim.config.get_per('accounts', a, 'answer_receipts'): gajim.gajim_optional_features[a].append(nbxmpp.NS_RECEIPTS) + gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE) if gajim.HAVE_FARSTREAM: - gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_AUDIO) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_RTP_VIDEO) gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_ICE_UDP) - gajim.gajim_optional_features[a].append( - nbxmpp.NS_JINGLE_FILE_TRANSFER) - gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_XTLS) - gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_BYTESTREAM) - gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_IBB) + gajim.gajim_optional_features[a].append( + nbxmpp.NS_JINGLE_FILE_TRANSFER) + gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_XTLS) + gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_BYTESTREAM) + gajim.gajim_optional_features[a].append(nbxmpp.NS_JINGLE_IBB) gajim.caps_hash[a] = caps_cache.compute_caps_hash([gajim.gajim_identity], gajim.gajim_common_features + gajim.gajim_optional_features[a]) # re-send presence with new hash

1 0

gajim: Overwrite the original random number generator seed file.
by Gajim 14 Nov '14

14 Nov '14

changeset 7343a60733ec in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7343a60733ec description: Overwrite the original random number generator seed file. After the random number generator seed file is read overwrite the previous content of the file. diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 1f58815ed1f5 -r 7343a60733ec src/gajim.py --- a/src/gajim.py Fri Apr 04 10:33:36 2014 +0200 +++ b/src/gajim.py Fri Apr 04 13:11:25 2014 +0200 @@ -332,6 +332,7 @@ except TypeError: OpenSSL.rand.load_file(RNG_SEED.encode('utf-8')) crypto.add_entropy_sources_OpenSSL() + OpenSSL.rand.write_file(str(RNG_SEED)) except ImportError: log.info("PyOpenSSL PRNG not available")

1 0

gajim: use host to resolve DNS if it's available.
by Gajim 14 Nov '14

14 Nov '14

changeset 6c66936576e5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6c66936576e5 description: use host to resolve DNS if it's available. diffstat: src/common/resolver.py | 147 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 114 insertions(+), 33 deletions(-) diffs (236 lines): diff -r 7343a60733ec -r 6c66936576e5 src/common/resolver.py --- a/src/common/resolver.py Fri Apr 04 13:11:25 2014 +0200 +++ b/src/common/resolver.py Wed Apr 09 17:04:03 2014 +0200 @@ -51,8 +51,13 @@ def get_resolver(idlequeue): if USE_LIBASYNCNS: + log.info('Using LibAsyncNSResolver') return LibAsyncNSResolver() else: + if helpers.is_in_path('host'): + log.info('Using HostResolver') + return HostResolver(idlequeue) + log.info('Using NSLookupResolver') return NSLookupResolver(idlequeue) class CommonResolver(): @@ -62,43 +67,43 @@ # dict {"host+type" : list of callbacks} self.handlers = {} - def resolve(self, host, on_ready, type='srv'): + def resolve(self, host, on_ready, type_='srv'): host = host.lower() - log.debug('resolve %s type=%s' % (host, type)) - assert(type in ['srv', 'txt']) + log.debug('resolve %s type=%s' % (host, type_)) + assert(type_ in ['srv', 'txt']) if not host: # empty host, return empty list of srv records on_ready([]) return - if host + type in self.resolved_hosts: + if host + type_ in self.resolved_hosts: # host is already resolved, return cached values log.debug('%s already resolved: %s' % (host, - self.resolved_hosts[host + type])) - on_ready(host, self.resolved_hosts[host + type]) + self.resolved_hosts[host + type_])) + on_ready(host, self.resolved_hosts[host + type_]) return - if host + type in self.handlers: + if host + type_ in self.handlers: # host is about to be resolved by another connection, # attach our callback log.debug('already resolving %s' % host) - self.handlers[host + type].append(on_ready) + self.handlers[host + type_].append(on_ready) else: # host has never been resolved, start now log.debug('Starting to resolve %s using %s' % (host, self)) - self.handlers[host + type] = [on_ready] - self.start_resolve(host, type) + self.handlers[host + type_] = [on_ready] + self.start_resolve(host, type_) - def _on_ready(self, host, type, result_list): + def _on_ready(self, host, type_, result_list): # practically it is impossible to be the opposite, but who knows :) host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) - if host + type not in self.resolved_hosts: - self.resolved_hosts[host + type] = result_list - if host + type in self.handlers: - for callback in self.handlers[host + type]: + if host + type_ not in self.resolved_hosts: + self.resolved_hosts[host + type_] = result_list + if host + type_ in self.handlers: + for callback in self.handlers[host + type_]: callback(host, result_list) - del(self.handlers[host + type]) + del(self.handlers[host + type_]) - def start_resolve(self, host, type): + def start_resolve(self, host, type_): pass # FIXME: API usage is not consistent! This one requires that process is called @@ -113,22 +118,22 @@ self.asyncns = libasyncns.Asyncns() CommonResolver.__init__(self) - def start_resolve(self, host, type): - type = libasyncns.ns_t_srv - if type == 'txt': type = libasyncns.ns_t_txt - resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type) - resq.userdata = {'host':host, 'type':type} + def start_resolve(self, host, type_): + type_ = libasyncns.ns_t_srv + if type_ == 'txt': type_ = libasyncns.ns_t_txt + resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type_) + resq.userdata = {'host':host, 'type':type_} # getaddrinfo to be done #def resolve_name(self, dname, callback): #resq = self.asyncns.getaddrinfo(dname) #resq.userdata = {'callback':callback, 'dname':dname} - def _on_ready(self, host, type, result_list): - if type == libasyncns.ns_t_srv: type = 'srv' - elif type == libasyncns.ns_t_txt: type = 'txt' + def _on_ready(self, host, type_, result_list): + if type_ == libasyncns.ns_t_srv: type_ = 'srv' + elif type_ == libasyncns.ns_t_txt: type_ = 'txt' - CommonResolver._on_ready(self, host, type, result_list) + CommonResolver._on_ready(self, host, type_, result_list) def process(self): try: @@ -153,7 +158,7 @@ continue r['prio'] = r['pref'] hosts.append(r) - self._on_ready(host=requested_host, type=requested_type, + self._on_ready(host=requested_host, type_=requested_type, result_list=hosts) try: resq = self.asyncns.get_next() @@ -276,27 +281,98 @@ 'prio': prio}) return hosts - def _on_ready(self, host, type, result): + def _on_ready(self, host, type_, result): # nslookup finished, parse the result and call the handlers result_list = self.parse_srv_result(host, result) - CommonResolver._on_ready(self, host, type, result_list) + CommonResolver._on_ready(self, host, type_, result_list) - def start_resolve(self, host, type): + def start_resolve(self, host, type_): """ Spawn new nslookup process and start waiting for results """ - ns = NsLookup(self._on_ready, host, type) + ns = NsLookup(self._on_ready, host, type_) ns.set_idlequeue(self.idlequeue) ns.commandtimeout = 20 ns.start() +class HostResolver(CommonResolver): + """ + Asynchronous DNS resolver calling host. Processing of pending requests + is invoked from idlequeue which is watching file descriptor of pipe of + stdout of host process. + """ + + def __init__(self, idlequeue): + self.idlequeue = idlequeue + self.process = False + CommonResolver.__init__(self) + + def parse_srv_result(self, fqdn, result): + """ + Parse the output of host command and return list of properties: + 'host', 'port','weight', 'priority' corresponding to the found srv hosts + """ + # typical output of host command: + # _xmpp-client._tcp.jabber.org has SRV record 30 30 5222 jabber.org. + if not result: + return [] + ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name + hosts = [] + lines = result.split('\n') + for line in lines: + if line == '': + continue + domain = None + if line.startswith(fqdn): + domain = fqdn # For nslookup 9.5 + elif helpers.decode_string(line).startswith(ufqdn): + line = helpers.decode_string(line) + domain = ufqdn # For nslookup 9.6 + if domain: + # add 4 for ' has' after domain name + rest = line[len(domain)+4:].split('=') + if len(rest) != 2: + continue + answer_type, props_str = rest + if answer_type.strip() != 'SRV': + continue + props = props_str.strip().split(' ') + if len(props) < 4: + continue + prio, weight, port, host = props[-4:] + if host[-1] == '.': + host = host[:-1] + try: + prio = int(prio) + weight = int(weight) + port = int(port) + except ValueError: + continue + hosts.append({'host': host, 'port': port, 'weight': weight, + 'prio': prio}) + return hosts + + def _on_ready(self, host, type_, result): + # host finished, parse the result and call the handlers + result_list = self.parse_srv_result(host, result) + CommonResolver._on_ready(self, host, type_, result_list) + + def start_resolve(self, host, type_): + """ + Spawn new nslookup process and start waiting for results + """ + ns = Host(self._on_ready, host, type_) + ns.set_idlequeue(self.idlequeue) + ns.commandtimeout = 20 + ns.start() + class NsLookup(IdleCommand): - def __init__(self, on_result, host='_xmpp-client', type='srv'): + def __init__(self, on_result, host='_xmpp-client', type_='srv'): 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) @@ -315,6 +391,11 @@ self.result_handler(self.host, self.type_, self.result) self.result_handler = None + +class Host(NsLookup): + def _compose_command_args(self): + return ['host', '-t', self.type_, self.host] + # below lines is on how to use API and assist in testing if __name__ == '__main__': from gi.repository import GLib

1 0

gajim: don't traceback when we try to open a remembered chat win...
by Gajim 14 Nov '14

14 Nov '14

changeset ada1a31b497b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ada1a31b497b description: don't traceback when we try to open a remembered chat window from a contact not in roster diffstat: src/roster_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 6c66936576e5 -r ada1a31b497b src/roster_window.py --- a/src/roster_window.py Wed Apr 09 17:04:03 2014 +0200 +++ b/src/roster_window.py Wed Apr 09 17:56:09 2014 +0200 @@ -2655,7 +2655,8 @@ gajim.contacts.get_contact_with_highest_priority( account, jid) if not contact: - continue + contact = self.add_to_not_in_the_roster(account, + jid) gajim.interface.on_open_chat_window(None, contact, account) gajim.config.set_per('accounts', account,

1 0

gajim: don't print twice nbxmpp version error message. Fixes #7720
by Gajim 14 Nov '14

14 Nov '14

changeset 26207c20eb5a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=26207c20eb5a description: don't print twice nbxmpp version error message. Fixes #7720 diffstat: src/gajim.py | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diffs (34 lines): diff -r ada1a31b497b -r 26207c20eb5a src/gajim.py --- a/src/gajim.py Wed Apr 09 17:56:09 2014 +0200 +++ b/src/gajim.py Wed Apr 09 18:02:30 2014 +0200 @@ -68,19 +68,26 @@ except ImportError: pass +HAS_NBXMPP=True +MIN_NBXMPP_VER = "0.3.3" try: import nbxmpp except ImportError: + HAS_NBXMPP=False + +if not HAS_NBXMPP: print('Gajim needs python-nbxmpp to run. Quiting...') sys.exit() try: from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V("0.3.3"): - print('Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...') - sys.exit() + if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): + HAS_NBXMPP=False except: - print('Gajim needs python-nbxmpp > 0.3.3 to run. Quiting...') + HAS_NBXMPP=False + +if not HAS_NBXMPP: + print 'Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER sys.exit() #from common import demandimport

1 0

gajim: XTLS keys will be stored separate for each profile.
by Gajim 14 Nov '14

14 Nov '14

changeset 198e8a642c7e in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=198e8a642c7e description: XTLS keys will be stored separate for each profile. Fixes #7735. diffstat: src/common/configpaths.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (44 lines): diff -r 26207c20eb5a -r 198e8a642c7e src/common/configpaths.py --- a/src/common/configpaths.py Wed Apr 09 18:02:30 2014 +0200 +++ b/src/common/configpaths.py Tue Apr 15 12:42:09 2014 +0200 @@ -141,7 +141,7 @@ d = {'MY_DATA': '', 'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', - 'PLUGINS_USER': 'plugins', 'MY_PEER_CERTS': 'certs', + 'PLUGINS_USER': 'plugins', 'RNG_SEED': 'rng_seed'} for name in d: self.add(name, TYPE_DATA, windowsify(d[name])) @@ -152,7 +152,6 @@ self.add(name, TYPE_CACHE, windowsify(d[name])) self.add('MY_CONFIG', TYPE_CONFIG, '') - self.add('MY_CERT', TYPE_CONFIG, '') basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify('data'))) @@ -178,16 +177,23 @@ pidfile = windowsify('gajim') secretsfile = windowsify('secrets') pluginsconfdir = windowsify('pluginsconfig') + certsdir = windowsify(u'certs') + localcertsdir = windowsify(u'localcerts') if len(profile) > 0: conffile += '.' + profile pidfile += '.' + profile secretsfile += '.' + profile pluginsconfdir += '.' + profile + certsdir += u'.' + profile + localcertsdir += u'.' + profile + pidfile += '.pid' self.add('CONFIG_FILE', TYPE_CONFIG, conffile) self.add('PID_FILE', TYPE_CACHE, pidfile) self.add('SECRETS_FILE', TYPE_DATA, secretsfile) self.add('PLUGINS_CONFIG_DIR', TYPE_CONFIG, pluginsconfdir) + self.add('MY_PEER_CERTS', TYPE_DATA, certsdir) + self.add('MY_CERT', TYPE_CONFIG, localcertsdir) gajimpaths = ConfigPaths()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014