Commits

commits@gajim.org

17632 discussions

gajim: correctly invite contacts when converting chat to groupch...
by Gajim 12 May '15

12 May '15

changeset 98d3fa740273 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=98d3fa740273 description: correctly invite contacts when converting chat to groupchat. Fixes #8028 diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 593282487ba4 -r 98d3fa740273 src/groupchat_control.py --- a/src/groupchat_control.py Sun May 10 20:56:41 2015 +0200 +++ b/src/groupchat_control.py Tue May 12 09:41:58 2015 +0200 @@ -1619,7 +1619,7 @@ # sent by all servers. gajim.connections[self.account].request_gc_config( self.room_jid) - elif 'continue_tag' not in gajim.automatic_rooms[ + elif 'continue_tag' in gajim.automatic_rooms[ self.account][self.room_jid]: # We just need to invite contacts for jid in gajim.automatic_rooms[self.account][

1 0

gajim: stop sending chatstates when we get an error message from...
by Gajim 10 May '15

10 May '15

changeset 593282487ba4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=593282487ba4 description: stop sending chatstates when we get an error message from a contact. Fixes #8010 diffstat: src/chat_control.py | 2 ++ src/gui_interface.py | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diffs (23 lines): diff -r b6baa323cad3 -r 593282487ba4 src/chat_control.py --- a/src/chat_control.py Sun May 10 20:54:26 2015 +0200 +++ b/src/chat_control.py Sun May 10 20:56:41 2015 +0200 @@ -2712,6 +2712,8 @@ if not contact.supports(NS_CHATSTATES): return + if contact.our_chatstate == False: + return # if the new state we wanna send (state) equals # the current state (contact.our_chatstate) then return diff -r b6baa323cad3 -r 593282487ba4 src/gui_interface.py --- a/src/gui_interface.py Sun May 10 20:54:26 2015 +0200 +++ b/src/gui_interface.py Sun May 10 20:56:41 2015 +0200 @@ -415,6 +415,7 @@ account=account, name=nick, show=show) ctrl = self.new_private_chat(gc_c, account, session) + ctrl.contact.our_chatstate = False ctrl.print_conversation(_('Error %(code)s: %(msg)s') % { 'code': obj.error_code, 'msg': obj.error_msg}, 'status') return

1 0

gajim: some cleanup
by Gajim 10 May '15

10 May '15

changeset b6baa323cad3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b6baa323cad3 description: some cleanup diffstat: src/common/zeroconf/connection_handlers_zeroconf.py | 3 --- src/common/zeroconf/connection_zeroconf.py | 1 + 2 files changed, 1 insertions(+), 3 deletions(-) diffs (24 lines): diff -r 4916254b34b7 -r b6baa323cad3 src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Mon Apr 06 19:14:33 2015 +0200 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Sun May 10 20:54:26 2015 +0200 @@ -24,9 +24,6 @@ ## import time -import socket - -from calendar import timegm import nbxmpp diff -r 4916254b34b7 -r b6baa323cad3 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Mon Apr 06 19:14:33 2015 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Sun May 10 20:54:26 2015 +0200 @@ -32,6 +32,7 @@ import os +import socket import random random.seed()

1 0

python-nbxmpp: roster set query element must contain only one it...
by Python-nbxmpp 10 May '15

10 May '15

changeset 398e3c8055a3 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=398e3c8055a3 description: roster set query element must contain only one item element. diffstat: nbxmpp/roster_nb.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r 25f8a6d152cc -r 398e3c8055a3 nbxmpp/roster_nb.py --- a/nbxmpp/roster_nb.py Tue Mar 10 18:12:16 2015 +0100 +++ b/nbxmpp/roster_nb.py Sun May 10 14:54:16 2015 +0200 @@ -242,16 +242,16 @@ """ Rename multiple contacts and sets their group lists """ - iq = Iq('set', NS_ROSTER) - query = iq.getTag('query') for i in items: + iq = Iq('set', NS_ROSTER) + query = iq.getTag('query') attrs = {'jid': i['jid']} if i['name']: attrs['name'] = i['name'] item = query.setTag('item', attrs) for group in i['groups']: item.addChild(node=Node('group', payload=[group])) - self._owner.send(iq) + self._owner.send(iq) def getItems(self): """

1 0

gajim: link-local: track multiple service resolved infos (curren...
by Gajim 09 May '15

09 May '15

changeset f9dbf7888107 in /home/hg/repos/gajim author: Fabian Pietsch <fabian(a)canvon.de> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f9dbf7888107 description: link-local: track multiple service resolved infos (currently one for each browsing protocol) diffstat: src/common/zeroconf/roster_zeroconf.py | 5 ++- src/common/zeroconf/zeroconf.py | 4 +- src/common/zeroconf/zeroconf_avahi.py | 50 +++++++++++++++++++++++++++------ 3 files changed, 46 insertions(+), 13 deletions(-) diffs (123 lines): diff -r 3bce5506df4c -r f9dbf7888107 src/common/zeroconf/roster_zeroconf.py --- a/src/common/zeroconf/roster_zeroconf.py Wed May 06 22:05:42 2015 +0200 +++ b/src/common/zeroconf/roster_zeroconf.py Sun Apr 05 02:25:10 2015 +0200 @@ -59,8 +59,9 @@ if not contact: return - host, address, port = contact[4:7] - txt = contact[8] + resolved_info = contact[zeroconf.C_RESOLVED_INFO] + host, aprotocol, address, port = resolved_info[0][zeroconf.C_RI_HOST:zeroconf.C_RI_PORT+1] + txt = contact[zeroconf.C_TXT] self._data[jid]={} self._data[jid]['ask'] = 'none' diff -r 3bce5506df4c -r f9dbf7888107 src/common/zeroconf/zeroconf.py --- a/src/common/zeroconf/zeroconf.py Wed May 06 22:05:42 2015 +0200 +++ b/src/common/zeroconf/zeroconf.py Sun Apr 05 02:25:10 2015 +0200 @@ -17,8 +17,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -C_NAME, C_DOMAIN, C_INTERFACE, C_PROTOCOL, C_HOST, \ -C_ADDRESS, C_PORT, C_BARE_NAME, C_TXT = range(9) +C_NAME, C_DOMAIN, C_RESOLVED_INFO, C_BARE_NAME, C_TXT = range(5) +C_RI_INTERFACE, C_RI_PROTOCOL, C_RI_HOST, C_RI_APROTOCOL, C_RI_ADDRESS, C_RI_PORT = range(6) def test_avahi(): try: diff -r 3bce5506df4c -r f9dbf7888107 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Wed May 06 22:05:42 2015 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Sun Apr 05 02:25:10 2015 +0200 @@ -25,7 +25,8 @@ except ImportError, e: pass -from common.zeroconf.zeroconf import C_BARE_NAME, C_INTERFACE, C_PROTOCOL, C_DOMAIN +from common.zeroconf.zeroconf import C_BARE_NAME, C_RESOLVED_INFO, \ +C_RI_INTERFACE, C_RI_PROTOCOL, C_RI_APROTOCOL, C_DOMAIN, C_TXT class Zeroconf: def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, @@ -93,7 +94,16 @@ return if name != self.name: for key in self.contacts.keys(): - if self.contacts[key][C_BARE_NAME] == name: + val = self.contacts[key] + if val[C_BARE_NAME] == name: + # try to reduce instead of delete first + resolved_info = val[C_RESOLVED_INFO] + if len(resolved_info) > 1: + for i in range(len(resolved_info)): + if resolved_info[i][C_RI_INTERFACE] == interface and resolved_info[i][C_RI_PROTOCOL] == protocol: + del self.contacts[key][C_RESOLVED_INFO][i] + # if still something left, don't remove + if len(self.contacts[key][C_RESOLVED_INFO]) > 1: return del self.contacts[key] self.remove_serviceCB(key) return @@ -151,16 +161,34 @@ # we don't want to see ourselves in the list if name != self.name: - self.contacts[name] = (name, domain, interface, protocol, host, - address, port, bare_name, txt) + resolved_info = [(interface, protocol, host, aprotocol, address, port)] + if name in self.contacts: + # Decide whether to try to merge with existing resolved info: + old_name, old_domain, old_resolved_info, old_bare_name, old_txt = self.contacts[name] + if name == old_name and domain == old_domain and bare_name == old_bare_name: + # Seems similar enough, try to merge resolved info: + for i in range(len(old_resolved_info)): + # for now, keep a single record for each (interface, protocol) pair + # + # Note that, theoretically, we could both get IPv4 and + # IPv6 aprotocol responses via the same protocol, + # so this probably needs to be revised again. + if old_resolved_info[i][0:2] == (interface, protocol): + log.debug('Deleting resolved info for interface %i, protocol %i, host %s, aprotocol %i, address %s, port %i' % old_resolved_info[i]) + del cur_hosts[i] + break + resolved_info = resolved_info + old_resolved_info + log.debug('Collected resolved info is now: %s' % (resolved_info,)) + self.contacts[name] = (name, domain, resolved_info, bare_name, txt) self.new_serviceCB(name) else: # remember data # In case this is not our own record but of another # gajim instance on the same machine, # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, interface, protocol, - host, address, port, bare_name, txt) + self.invalid_self_contact[name] = (name, domain, + (interface, protocol, host, aprotocol, address, port), + bare_name, txt) # different handler when resolving all contacts @@ -171,8 +199,9 @@ bare_name = name if name.find('@') == -1: name = name + '@' + name - self.contacts[name] = (name, domain, interface, protocol, host, address, - port, bare_name, txt) + # update TXT data only, as intended according to resolve_all comment + old_contact = self.contacts[name] + self.contacts[name] = old_contact[0:C_TXT] + (txt,) + old_contact[C_TXT+1:] def service_added_callback(self): log.debug('Service successfully added') @@ -426,7 +455,10 @@ if not self.connected: return for val in self.contacts.values(): - self.server.ResolveService(int(val[C_INTERFACE]), int(val[C_PROTOCOL]), + # get txt data from last recorded resolved info + # TODO: Better try to get it from last IPv6 mDNS, then last IPv4? + ri = val[C_RESOLVED_INFO][0] + self.server.ResolveService(int(ri[C_RI_INTERFACE]), int(ri[C_RI_PROTOCOL]), val[C_BARE_NAME], self.stype, val[C_DOMAIN], self.avahi.PROTO_UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved_all_callback,

1 0

gajim: link-local: try to connect to each collected address in turn
by Gajim 09 May '15

09 May '15

changeset 079c551ff9ff in /home/hg/repos/gajim author: Fabian Pietsch <fabian(a)canvon.de> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=079c551ff9ff description: link-local: try to connect to each collected address in turn diffstat: src/common/zeroconf/client_zeroconf.py | 77 ++++++++++++++++++++++----------- src/common/zeroconf/roster_zeroconf.py | 14 +++-- 2 files changed, 60 insertions(+), 31 deletions(-) diffs (199 lines): diff -r f9dbf7888107 -r 079c551ff9ff src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Apr 05 02:25:10 2015 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Mon Apr 06 16:33:10 2015 +0200 @@ -99,10 +99,11 @@ ipaddr = sock[1][0] for jid in self.conn_holder.getRoster().keys(): entry = self.conn_holder.getRoster().getItem(jid) - if (entry['address'] == ipaddr): - from_jid = jid - break - P2PClient(sock[0], ipaddr, sock[1][1], self.conn_holder, [], from_jid) + for address in entry['addresses']: + if (address['address'] == ipaddr): + from_jid = jid + break + P2PClient(sock[0], [{'host': ipaddr, 'address': ipaddr, 'port': sock[1][1]}], self.conn_holder, [], from_jid) def disconnect(self, message=''): """ @@ -128,7 +129,7 @@ return _sock class P2PClient(IdleObject): - def __init__(self, _sock, host, port, conn_holder, stanzaqueue, to=None, + def __init__(self, _sock, addresses, conn_holder, stanzaqueue, to=None, on_ok=None, on_not_ok=None): self._owner = self self.Namespace = 'jabber:client' @@ -140,7 +141,7 @@ self.conn_holder = conn_holder self.stanzaqueue = stanzaqueue self.to = to - self.Server = host + #self.Server = addresses[0]['host'] self.on_ok = on_ok self.on_not_ok = on_not_ok self.Connection = None @@ -150,8 +151,9 @@ else: self.sock_type = TYPE_CLIENT self.fd = -1 - conn = P2PConnection('', _sock, host, port, self._caller, + conn = P2PConnection('', _sock, addresses, self._caller, self.on_connect, self) + self.Server = conn.host # set Server to the last host name / address tried if not self.conn_holder: # An error occured, disconnect() has been called if on_not_ok: @@ -159,7 +161,7 @@ return self.sock_hash = conn._sock.__hash__ self.fd = conn.fd - self.conn_holder.add_connection(self, self.Server, port, self.to) + self.conn_holder.add_connection(self, self.Server, conn.port, self.to) # count messages in queue for val in self.stanzaqueue: stanza, is_message = val @@ -328,7 +330,7 @@ nbxmpp.NS_JINGLE) class P2PConnection(IdleObject, PlugIn): - def __init__(self, sock_hash, _sock, host=None, port=None, caller=None, + def __init__(self, sock_hash, _sock, addresses=None, caller=None, on_connect=None, client=None): IdleObject.__init__(self) self._owner = client @@ -338,7 +340,7 @@ self.buff_is_message = False self._sock = _sock self.sock_hash = None - self.host, self.port = host, port + self.addresses = addresses self.on_connect = on_connect self.client = client self.writable = False @@ -346,6 +348,8 @@ self._exported_methods = [self.send, self.disconnect, self.onreceive] self.on_receive = None if _sock: + self.host = addresses[0]['host'] + self.port = addresses[0]['port'] self._sock = _sock self.state = 1 self._sock.setblocking(False) @@ -353,17 +357,26 @@ self.on_connect(self) else: self.state = 0 - try: - self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC, - socket.SOCK_STREAM) - except socket.gaierror, e: - log.info('Lookup failure for %s: %s[%s]', host, e[1], - repr(e[0]), exc_info=True) - else: - self.connect_to_next_ip() + self.addresses_ = self.addresses + self.get_next_addrinfo() + + def get_next_addrinfo(self): + address = self.addresses_.pop(0) + self.host = address['host'] + self.port = address['port'] + try: + self.ais = socket.getaddrinfo(address['host'], address['port'], socket.AF_UNSPEC, + socket.SOCK_STREAM) + except socket.gaierror, e: + log.info('Lookup failure for %s: %s[%s]', host, e[1], + repr(e[0]), exc_info=True) + if len(self.addresses_) > 0: return self.get_next_addrinfo() + else: + self.connect_to_next_ip() def connect_to_next_ip(self): if len(self.ais) == 0: + if len(self.addresses_) > 0: return self.get_next_addrinfo() log.error('Connection failure to %s', str(self.host), exc_info=True) self.disconnect() return @@ -755,9 +768,13 @@ on_ok(id_) return - if item['address'] in self.ip_to_hash: - hash_ = self.ip_to_hash[item['address']] - if self.hash_to_port[hash_] == item['port']: + the_address = None + for address in item['addresses']: + if address['address'] in self.ip_to_hash: + the_address = address + if the_address and the_address['address'] in self.ip_to_hash: + hash_ = self.ip_to_hash[the_address['address']] + if self.hash_to_port[hash_] == the_address['port']: conn = self.connections[hash_] id_ = stanza.getID() or '' if conn.add_stanza(stanza, is_message): @@ -768,7 +785,10 @@ # otherwise open new connection if not stanza.getID(): stanza.setID('zero') - P2PClient(None, item['address'], item['port'], self, + addresses_ = [] + for address in item['addresses']: + addresses_ += [{'host': address['address'], 'address': address['address'], 'port': address['port']}] + P2PClient(None, addresses_, self, [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) def getAnID(self): @@ -814,10 +834,15 @@ conn = None if to in self.recipient_to_hash: conn = self.connections[self.recipient_to_hash[to]] - elif item and item['address'] in self.ip_to_hash: - hash_ = self.ip_to_hash[item['address']] - if self.hash_to_port[hash_] == item['port']: - conn = self.connections[hash_] + elif item: + the_address = None + for address in item['addresses']: + if address['address'] in self.ip_to_hash: + the_address = address + if the_address and the_address['address'] in self.ip_to_hash: + hash_ = self.ip_to_hash[the_address['address']] + if self.hash_to_port[hash_] == the_address['port']: + conn = self.connections[hash_] if func: conn.Dispatcher.on_responses[_waitid] = (func, args) conn.onreceive(conn.Dispatcher._WaitForData) diff -r f9dbf7888107 -r 079c551ff9ff src/common/zeroconf/roster_zeroconf.py --- a/src/common/zeroconf/roster_zeroconf.py Sun Apr 05 02:25:10 2015 +0200 +++ b/src/common/zeroconf/roster_zeroconf.py Mon Apr 06 16:33:10 2015 +0200 @@ -59,8 +59,14 @@ if not contact: return - resolved_info = contact[zeroconf.C_RESOLVED_INFO] - host, aprotocol, address, port = resolved_info[0][zeroconf.C_RI_HOST:zeroconf.C_RI_PORT+1] + addresses = [] + i = 0 + for ri in contact[zeroconf.C_RESOLVED_INFO]: + addresses += [{}] + addresses[i]['host'] = ri[zeroconf.C_RI_HOST] + addresses[i]['address'] = ri[zeroconf.C_RI_ADDRESS] + addresses[i]['port'] = ri[zeroconf.C_RI_PORT] + i += 1 txt = contact[zeroconf.C_TXT] self._data[jid]={} @@ -68,9 +74,7 @@ self._data[jid]['subscription'] = 'both' self._data[jid]['groups'] = [] self._data[jid]['resources'] = {} - self._data[jid]['address'] = address - self._data[jid]['host'] = host - self._data[jid]['port'] = port + self._data[jid]['addresses'] = addresses txt_dict = self.zeroconf.txt_array_to_dict(txt) status = txt_dict.get('status', '') if not status:

1 0

gajim: link-local: on error after connect(), try next address
by Gajim 09 May '15

09 May '15

changeset ee4655523955 in /home/hg/repos/gajim author: Fabian Pietsch <fabian(a)canvon.de> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ee4655523955 description: link-local: on error after connect(), try next address diffstat: src/common/zeroconf/client_zeroconf.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (28 lines): diff -r 079c551ff9ff -r ee4655523955 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Mon Apr 06 16:33:10 2015 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Mon Apr 06 18:55:23 2015 +0200 @@ -376,8 +376,8 @@ def connect_to_next_ip(self): if len(self.ais) == 0: + log.error('Connection failure to %s', str(self.host), exc_info=True) if len(self.addresses_) > 0: return self.get_next_addrinfo() - log.error('Connection failure to %s', str(self.host), exc_info=True) self.disconnect() return ai = self.ais.pop(0) @@ -495,8 +495,12 @@ self._do_send() def pollend(self): - self.state = -1 - self.disconnect() + if self.state == 0: # error in connect()? + #self.disconnect() + self.connect_to_next_ip() + else: + self.state = -1 + self.disconnect() def pollin(self): """

1 0

gajim: link-local: adjust Windows/Bonjour support to new data fo...
by Gajim 09 May '15

09 May '15

changeset 4916254b34b7 in /home/hg/repos/gajim author: Fabian Pietsch <fabian(a)canvon.de> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4916254b34b7 description: link-local: adjust Windows/Bonjour support to new data format. Fixes #8025 diffstat: src/common/zeroconf/zeroconf_bonjour.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (33 lines): diff -r ee4655523955 -r 4916254b34b7 src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Mon Apr 06 18:55:23 2015 +0200 +++ b/src/common/zeroconf/zeroconf_bonjour.py Mon Apr 06 19:14:33 2015 +0200 @@ -133,7 +133,8 @@ # we don't want to see ourselves in the list if name != self.name: - self.contacts[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) + resolved_info = [(interfaceIndex, protocol, hosttarget, -1, port)] + self.contacts[name] = (name, domain, resolved_info, bare_name, txtRecord) self.new_serviceCB(name) else: @@ -141,7 +142,7 @@ # In case this is not our own record but of another # gajim instance on the same machine, # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) + self.invalid_self_contact[name] = (name, domain, (interfaceIndex, protocol, hosttarget, -1, port), bare_name, txtRecord) # count services self.resolved.append(True) @@ -168,7 +169,9 @@ # we don't want to see ourselves in the list if name != self.name: - self.contacts[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) + # update TXT data only, as intended according to resolve_all comment + old_contact = self.contacts[name] + self.contacts[name] = old_contact[0:C_TXT] + (txt,) + old_contact[C_TXT+1:] def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain):

1 0

gajim: make urgency hint work correctly in one message window mo...
by Gajim 06 May '15

06 May '15

changeset 3bce5506df4c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3bce5506df4c description: make urgency hint work correctly in one message window mode. Fixes #7806 diffstat: src/roster_window.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diffs (37 lines): diff -r b311fd4f2983 -r 3bce5506df4c src/roster_window.py --- a/src/roster_window.py Mon May 04 22:53:39 2015 +0200 +++ b/src/roster_window.py Wed May 06 22:05:42 2015 +0200 @@ -4983,15 +4983,7 @@ if not change_title_allowed: return - if gajim.config.get('one_message_window') == 'always_with_roster': - # always_with_roster mode defers to the MessageWindow - if not gajim.interface.msg_win_mgr.one_window_opened(): - # No MessageWindow to defer to - self.window.set_title('Gajim') - return - nb_unread = 0 - start = '' for account in gajim.connections: # Count events in roster title only if we don't auto open them if not helpers.allow_popup_window(account): @@ -4999,6 +4991,17 @@ 'file-request', 'file-error', 'file-completed', 'file-request-error', 'file-send-error', 'file-stopped', 'printed_chat'], account) + + + if gajim.config.get('one_message_window') == 'always_with_roster': + # always_with_roster mode defers to the MessageWindow + if not gajim.interface.msg_win_mgr.one_window_opened(): + # No MessageWindow to defer to + self.window.set_title('Gajim') + gtkgui_helpers.set_unset_urgency_hint(self.window, nb_unread) + return + + start = '' if nb_unread > 1: start = '[' + str(nb_unread) + '] ' elif nb_unread == 1:

1 0

gajim: [Nathan Follens] updated Dutch translation
by Gajim 04 May '15

04 May '15

changeset b311fd4f2983 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b311fd4f2983 description: [Nathan Follens] updated Dutch translation diffstat: po/nl.po | 7928 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 3833 insertions(+), 4095 deletions(-) diffs (truncated from 14209 to 300 lines): diff -r 91357cbaf125 -r b311fd4f2983 po/nl.po --- a/po/nl.po Sun Apr 05 21:49:39 2015 +0200 +++ b/po/nl.po Mon May 04 22:53:39 2015 +0200 @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: gajim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-29 15:27+0200\n" -"PO-Revision-Date: 2005-12-19 18:44+0100\n" -"Last-Translator: Stéphan Kochen <stephan(a)kochen.nl>\n" +"POT-Creation-Date: 2015-05-04 22:52+0200\n" +"PO-Revision-Date: 2015-04-24 00:10+0100\n" +"Last-Translator: Nathan Follens <nthn(a)unseen.is>\n" "Language-Team: none\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 @@ -25,46 +26,44 @@ msgstr "_Status" #: ../data/gui/account_context_menu.ui.h:2 -#, fuzzy msgid "_Personal Events" -msgstr "Persoonlijke Informatie" +msgstr "_Persoonlijke gebeurtenissen" #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 -#, fuzzy +#: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat..." -msgstr "_Start Gesprek" - -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 -#, fuzzy -msgid "Join _Group Chat..." -msgstr "Neem deel aan _Groepsgesprek" +msgstr "Ge_sprek beginnen..." + +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 +#: ../data/gui/systray_context_menu.ui.h:3 +msgid "Join _Group Chat" +msgstr "Deelnemen aan _groepsgesprek" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." -msgstr "_Contact Toevoegen..." +msgstr "Cont_act toevoegen..." #: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" -msgstr "Ontdek Services" +msgstr "Ontdek diensten" #: ../data/gui/account_context_menu.ui.h:7 -#, fuzzy msgid "_Execute Command..." -msgstr "commando" +msgstr "Commando uitvoer_en..." #: ../data/gui/account_context_menu.ui.h:8 -#, fuzzy msgid "_Open Gmail Inbox" -msgstr "_Open Email Samensteller" +msgstr "_Open GMail-inbox" #: ../data/gui/account_context_menu.ui.h:9 -#, fuzzy -msgid "_Modify Account" +#: ../data/gui/zeroconf_context_menu.ui.h:2 +msgid "_Modify Account..." msgstr "Account Be_werken..." #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Wizard Account Aanmaken" +msgstr "Gajim: wizard account aanmaken" #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" @@ -75,9 +74,8 @@ "met het Jabber netwerk." #: ../data/gui/account_creation_wizard_window.ui.h:4 -#, fuzzy msgid "I already have an account I want to _use" -msgstr "Ik heb al een account die ik wil gebruiken" +msgstr "Ik heb al een account die ik wil gebr_uiken" #: ../data/gui/account_creation_wizard_window.ui.h:5 msgid "I want to _register for a new account" @@ -88,9 +86,8 @@ msgstr "Kies een van de volgende opties:" #: ../data/gui/account_creation_wizard_window.ui.h:7 -#, fuzzy msgid "Please fill in the data for your existing account" -msgstr "Vul de informatie in voor je nieuwe account" +msgstr "Vul de informatie in voor je bestaande account" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -114,13 +111,12 @@ msgstr "_Jabber ID:" #: ../data/gui/account_creation_wizard_window.ui.h:12 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "Gebruik aanmelding" +msgstr "Anon_ieme authenticatie" #: ../data/gui/account_creation_wizard_window.ui.h:13 msgid "Please select a server" -msgstr "" +msgstr "Kies een server" #: ../data/gui/account_creation_wizard_window.ui.h:14 #: ../data/gui/manage_bookmarks_window.ui.h:3 @@ -128,9 +124,8 @@ msgstr "_Server:" #: ../data/gui/account_creation_wizard_window.ui.h:15 -#, fuzzy msgid "Prox_y:" -msgstr "Proxy:" +msgstr "Prox_y:" #: ../data/gui/account_creation_wizard_window.ui.h:16 msgid "Manage..." @@ -141,9 +136,8 @@ msgstr "Gebruik aangepaste hostnaam/poort" #: ../data/gui/account_creation_wizard_window.ui.h:18 -#, fuzzy msgid "_Hostname:" -msgstr "Hostnaam: " +msgstr "_Hostnaam:" #: ../data/gui/account_creation_wizard_window.ui.h:19 msgid "_Port:" @@ -159,15 +153,16 @@ "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" +"Voeg dit certificaat toe aan de lijst van vertrouwde certificaten.\n" +"SHA1-vingerafdruk van het certificaat:\n" #: ../data/gui/account_creation_wizard_window.ui.h:24 -#, fuzzy msgid "" "Connecting to server\n" "\n" "Please wait..." msgstr "" -"Account wordt aangemaakt\n" +"Verbinden met server\n" "\n" "Een ogenblik geduld..." @@ -176,9 +171,8 @@ msgstr "Verbind zodra ik Afronden druk" #: ../data/gui/account_creation_wizard_window.ui.h:28 -#, fuzzy msgid "Set my profile when I connect" -msgstr "Stel een contactafbeelding in zodra ik verbinding maak" +msgstr "Stel mijn profiel in wanneer ik verbinding maak" #: ../data/gui/account_creation_wizard_window.ui.h:29 msgid "_Finish" @@ -186,13 +180,13 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 -#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 -#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 -#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 -#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3147 -#: ../src/roster_window.py:3153 ../src/roster_window.py:3158 +#: ../src/config.py:1258 ../src/config.py:1273 ../src/config.py:1278 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1750 +#: ../src/config.py:1755 ../src/config.py:2358 ../src/config.py:2440 +#: ../src/config.py:2455 ../src/config.py:3751 ../src/config.py:3826 +#: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 +#: ../src/dialogs.py:537 ../src/roster_window.py:3188 +#: ../src/roster_window.py:3194 ../src/roster_window.py:3199 msgid "None" msgstr "Geen" @@ -201,34 +195,29 @@ msgstr "Accounts" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 -#: ../src/dialogs.py:3570 -#, fuzzy +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3542 +#: ../src/dialogs.py:3588 msgid "Add" -msgstr "Adres" +msgstr "Toevoegen" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 -#: ../src/dialogs.py:3625 -#, fuzzy +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3546 +#: ../src/dialogs.py:3643 msgid "Delete" -msgstr "Wis MOTD" - -#. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792 +msgstr "Verwijderen" + +#: ../data/gui/accounts_window.ui.h:5 msgid "Re_name" msgstr "Her_noem" -#. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -#, fuzzy -msgid "_Enable" -msgstr "Inschakelen" +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4199 +#: ../src/plugins/gui.py:92 +msgid "Active" +msgstr "Actief" #: ../data/gui/accounts_window.ui.h:7 -#, fuzzy msgid "Anonymous authentication" -msgstr "Gebruik aanmelding" +msgstr "Anonieme authenticatie" #: ../data/gui/accounts_window.ui.h:8 msgid "" @@ -245,24 +234,24 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1 -#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168 -#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339 +#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1178 +#: ../src/common/helpers.py:1190 ../src/notify.py:316 ../src/notify.py:339 #: ../src/notify.py:389 ../src/notify.py:405 msgid "Gajim" msgstr "Gajim" #: ../data/gui/accounts_window.ui.h:10 -#, fuzzy msgid "Synchronize contacts" -msgstr "_Offline Contacten Weergeven" +msgstr "Contacten synchroniseren" #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" msgstr "" +"Klik om authorisatie te vragen aan alle contacten van een andere account" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" -msgstr "Verander Wachtwoord" +msgstr "Verander wa_chtwoord" #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" @@ -284,41 +273,36 @@ "prioriteit wint." #: ../data/gui/accounts_window.ui.h:16 -#, fuzzy msgid "A_djust to status" -msgstr "Vraag hem/haar toestemming zijn/haar status te zien" +msgstr "Aan_passen aan status" #: ../data/gui/accounts_window.ui.h:17 msgid "Priority will change automatically according to your status." -msgstr "" +msgstr "Prioriteit verandert automatisch naargelang je status." #: ../data/gui/accounts_window.ui.h:18 msgid "Priori_ty:" msgstr "Priori_teit" #: ../data/gui/accounts_window.ui.h:19 -#, fuzzy msgid "Resour_ce:" msgstr "_Bron: " #: ../data/gui/accounts_window.ui.h:24 msgid "_Client Cert File:"

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