Commits

commits@gajim.org

17632 discussions

gajim: don't crash when GPG key are badly encrypted
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset f56cc76ddabe in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f56cc76ddabe description: don't crash when GPG key are badly encrypted diffstat: src/common/gpg.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 5b895f6c9249 -r f56cc76ddabe src/common/gpg.py --- a/src/common/gpg.py Tue Jul 16 18:28:17 2013 +0200 +++ b/src/common/gpg.py Wed Jul 17 12:50:34 2013 +0200 @@ -31,6 +31,7 @@ class GnuPG(gnupg.GPG): def __init__(self, use_agent=False): gnupg.GPG.__init__(self) + self.decode_errors = 'replace' self.passphrase = None self.use_agent = use_agent self.always_trust = False

1 0

gajim: get the expired key information back
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset d5043f1dc3a7 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=d5043f1dc3a7 description: get the expired key information back diffstat: src/common/gnupg.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (25 lines): diff -r f56cc76ddabe -r d5043f1dc3a7 src/common/gnupg.py --- a/src/common/gnupg.py Wed Jul 17 12:50:34 2013 +0200 +++ b/src/common/gnupg.py Wed Jul 17 15:04:10 2013 +0200 @@ -494,6 +494,7 @@ self.type = None self.hash_algo = None self.fingerprint = None + self.status = '' def __nonzero__(self): return self.fingerprint is not None @@ -506,9 +507,11 @@ def handle_status(self, key, value): if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", - "KEYEXPIRED", "SIGEXPIRED", "KEYREVOKED", "NO_SGNR", - "MISSING_PASSPHRASE", "SC_OP_FAILURE", "SC_OP_SUCCESS"): + "KEYREVOKED", "NO_SGNR", "MISSING_PASSPHRASE", + "SC_OP_FAILURE", "SC_OP_SUCCESS"): pass + elif key in ("KEYEXPIRED", "SIGEXPIRED"): + self.status = 'key expired' elif key == "SIG_CREATED": (self.type, algo, self.hash_algo, cls,

1 0

gajim: improve connection with big roster. See #7125
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 5dcd85c99d97 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5dcd85c99d97 description: improve connection with big roster. See #7125 diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r d5043f1dc3a7 -r 5dcd85c99d97 src/roster_window.py --- a/src/roster_window.py Wed Jul 17 15:04:10 2013 +0200 +++ b/src/roster_window.py Thu Jul 18 13:39:14 2013 +0200 @@ -280,7 +280,7 @@ Add all contacts and groups of the given account to roster, draw them and account """ - self.starting = True + self._before_fill() jids = gajim.contacts.get_jid_list(account) for jid in jids: @@ -296,7 +296,7 @@ self.draw_group(group, account) self.draw_account(account) - self.starting = False + self._after_fill() def _add_group_iter(self, account, group): """

1 0

gajim: don't redraw roster line when it's not necessary
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 5b2f3b22ed6c in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5b2f3b22ed6c description: don't redraw roster line when it's not necessary diffstat: src/gui_interface.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (33 lines): diff -r 83684b2793cd -r 5b2f3b22ed6c src/gui_interface.py --- a/src/gui_interface.py Mon Jul 15 16:03:07 2013 +0200 +++ b/src/gui_interface.py Tue Jul 16 18:03:58 2013 +0200 @@ -788,21 +788,24 @@ # another of our instance removed a contact. Remove it here too self.roster.remove_contact(obj.jid, account, backend=True) return + update = False if contacts[0].sub != obj.sub or contacts[0].ask != obj.ask\ or old_groups != obj.groups: # c.get_shown_groups() has changed. Reflect that in # roster_window self.roster.remove_contact(obj.jid, account, force=True) + update = True for contact in contacts: contact.name = obj.nickname or '' contact.sub = obj.sub contact.ask = obj.ask contact.groups = obj.groups or [] - self.roster.add_contact(obj.jid, account) - # Refilter and update old groups - for group in old_groups: - self.roster.draw_group(group, account) - self.roster.draw_contact(obj.jid, account) + if update: + self.roster.add_contact(obj.jid, account) + # Refilter and update old groups + for group in old_groups: + self.roster.draw_group(group, account) + self.roster.draw_contact(obj.jid, account) if obj.jid in self.instances[account]['sub_request'] and obj.sub in ( 'from', 'both'): self.instances[account]['sub_request'][obj.jid].window.destroy()

1 0

gajim: read assigned GPG key when creating the contacts. fixes: ...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 5b895f6c9249 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5b895f6c9249 description: read assigned GPG key when creating the contacts. fixes: #7111 diffstat: src/gui_interface.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 5b2f3b22ed6c -r 5b895f6c9249 src/gui_interface.py --- a/src/gui_interface.py Tue Jul 16 18:03:58 2013 +0200 +++ b/src/gui_interface.py Tue Jul 16 18:28:17 2013 +0200 @@ -773,9 +773,14 @@ if obj.sub == 'remove': return # Add new contact to roster + keyID = '' + attached_keys = gajim.config.get_per('accounts', account, + 'attached_gpg_keys').split() + if obj.jid in attached_keys: + keyID = attached_keys[attached_keys.index(obj.jid) + 1] contact = gajim.contacts.create_contact(jid=obj.jid, account=account, name=obj.nickname, groups=obj.groups, - show='offline', sub=obj.sub, ask=obj.ask) + show='offline', sub=obj.sub, ask=obj.ask, keyID=keyID) gajim.contacts.add_contact(account, contact) self.roster.add_contact(obj.jid, account) else:

1 0

gajim: distinguish console-printed strings in translation files....
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 24378d4b6550 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=24378d4b6550 description: distinguish console-printed strings in translation files. Fixes #7267 diffstat: src/gajim-remote.py | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diffs (163 lines): diff -r 1a922a841545 -r 24378d4b6550 src/gajim-remote.py --- a/src/gajim-remote.py Mon Jul 08 15:46:01 2013 +0200 +++ b/src/gajim-remote.py Mon Jul 15 15:13:39 2013 +0200 @@ -93,7 +93,7 @@ _('Prints a list of all contacts in the roster. Each contact ' 'appears on a separate line'), [ - (_('account'), _('show only contacts of the given account'), + (_('?CLI:account'), _('show only contacts of the given account'), False) ] @@ -106,9 +106,9 @@ _('Changes the status of account or accounts'), [ #offline, online, chat, away, xa, dnd, invisible should not be translated - (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account\'s previous status'), False), - (_('message'), _('status message'), False), - (_('account'), _('change status of account "account". ' + (_('?CLI:status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account\'s previous status'), False), + (_('?CLI:message'), _('status message'), False), + (_('?CLI:account'), _('change status of account "account". ' 'If not specified, try to change status of all accounts that have ' '"sync with global status" option set'), False) ] @@ -116,9 +116,9 @@ 'set_priority': [ _('Changes the priority of account or accounts'), [ - (_('priority'), _('priority you want to give to the account'), + (_('?CLI:priority'), _('priority you want to give to the account'), True), - (_('account'), _('change the priority of the given account. ' + (_('?CLI:account'), _('change the priority of the given account. ' 'If not specified, change status of all accounts that have' ' "sync with global status" option set'), False) ] @@ -128,9 +128,9 @@ [ ('jid', _('JID of the contact that you want to chat with'), True), - (_('account'), _('if specified, contact is taken from the ' + (_('?CLI:account'), _('if specified, contact is taken from the ' 'contact list of this account'), False), - (_('message'), + (_('?CLI:message'), _('message content. The account must be specified or ""'), False) ] @@ -141,10 +141,10 @@ 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), [ ('jid', _('JID of the contact that will receive the message'), True), - (_('message'), _('message contents'), True), + (_('?CLI:message'), _('message contents'), True), (_('pgp key'), _('if specified, the message will be encrypted ' 'using this public key'), False), - (_('account'), _('if specified, the message will be sent ' + (_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -155,10 +155,10 @@ [ ('jid', _('JID of the contact that will receive the message'), True), (_('subject'), _('message subject'), True), - (_('message'), _('message contents'), True), + (_('?CLI:message'), _('message contents'), True), (_('pgp key'), _('if specified, the message will be encrypted ' 'using this public key'), False), - (_('account'), _('if specified, the message will be sent ' + (_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -166,8 +166,8 @@ _('Sends new message to a groupchat you\'ve joined.'), [ ('room_jid', _('JID of the room that will receive the message'), True), - (_('message'), _('message contents'), True), - (_('account'), _('if specified, the message will be sent ' + (_('?CLI:message'), _('message contents'), True), + (_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -188,7 +188,7 @@ [ (_('file'), _('File path'), True), ('jid', _('JID of the contact'), True), - (_('account'), _('if specified, file will be sent using this ' + (_('?CLI:account'), _('if specified, file will be sent using this ' 'account'), False) ] ], @@ -218,7 +218,7 @@ _('Removes contact from roster'), [ ('jid', _('JID of the contact'), True), - (_('account'), _('if specified, contact is taken from the ' + (_('?CLI:account'), _('if specified, contact is taken from the ' 'contact list of this account'), False) ] @@ -227,21 +227,21 @@ _('Adds contact to roster'), [ (_('jid'), _('JID of the contact'), True), - (_('account'), _('Adds new contact to this account'), False) + (_('?CLI:account'), _('Adds new contact to this account'), False) ] ], 'get_status': [ _('Returns current status (the global one unless account is specified)'), [ - (_('account'), '', False) + (_('?CLI:account'), '', False) ] ], 'get_status_message': [ _('Returns current status message (the global one unless account is specified)'), [ - (_('account'), '', False) + (_('?CLI:account'), '', False) ] ], @@ -252,7 +252,7 @@ 'start_chat': [ _('Opens \'Start Chat\' dialog'), [ - (_('account'), _('Starts chat, using this account'), True) + (_('?CLI:account'), _('Starts chat, using this account'), True) ] ], 'send_xml': [ @@ -277,18 +277,18 @@ _('Handle a xmpp:/ uri'), [ (_('uri'), _('URI to handle'), True), - (_('account'), _('Account in which you want to handle it'), + (_('?CLI:account'), _('Account in which you want to handle it'), False), - (_('message'), _('Message content'), False) + (_('?CLI:message'), _('Message content'), False) ] ], 'join_room': [ _('Join a MUC room'), [ - (_('room'), _('Room JID'), True), - (_('nick'), _('Nickname to use'), False), - (_('password'), _('Password to enter the room'), False), - (_('account'), _('Account from which you want to enter the ' + (_('?CLI:room'), _('Room JID'), True), + (_('?CLI:nick'), _('Nickname to use'), False), + (_('?CLI:password'), _('Password to enter the room'), False), + (_('?CLI:account'), _('Account from which you want to enter the ' 'room'), False) ] ],

1 0

gajim: add some title to windows. Fixes #7383
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset aa3f351d9e79 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=aa3f351d9e79 description: add some title to windows. Fixes #7383 diffstat: data/gui/manage_sounds_window.ui | 1 + src/dialogs.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diffs (22 lines): diff -r 24378d4b6550 -r aa3f351d9e79 data/gui/manage_sounds_window.ui --- a/data/gui/manage_sounds_window.ui Mon Jul 15 15:13:39 2013 +0200 +++ b/data/gui/manage_sounds_window.ui Mon Jul 15 15:34:14 2013 +0200 @@ -6,6 +6,7 @@ <property name="width_request">400</property> <property name="height_request">350</property> <property name="border_width">6</property> + <property name="title" translatable="yes">Manage sounds</property> <property name="type_hint">dialog</property> <signal name="delete_event" handler="on_manage_sounds_window_delete_event"/> <child> diff -r 24378d4b6550 -r aa3f351d9e79 src/dialogs.py --- a/src/dialogs.py Mon Jul 15 15:13:39 2013 +0200 +++ b/src/dialogs.py Mon Jul 15 15:34:14 2013 +0200 @@ -5315,6 +5315,7 @@ class CertificatDialog(InformationDialog): def __init__(self, parent, account, cert): + self.set_title(_('Certificate for account %s') % account) issuer = cert.get_issuer() subject = cert.get_subject() InformationDialog.__init__(self,

1 0

gajim: fix using FT proxies. Fixes #7382
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 83684b2793cd in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=83684b2793cd description: fix using FT proxies. Fixes #7382 diffstat: src/common/protocol/bytestream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r aa3f351d9e79 -r 83684b2793cd src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Jul 15 15:34:14 2013 +0200 +++ b/src/common/protocol/bytestream.py Mon Jul 15 16:03:07 2013 +0200 @@ -726,7 +726,7 @@ port=int(proxy['port']), fingerprint=None, connected=False, file_props=file_props) sender.streamhost = proxy - gajim.socks5queue.add_sockobj(self.name, sender, 'sender') + gajim.socks5queue.add_sockobj(self.name, sender) proxy['idx'] = sender.queue_idx gajim.socks5queue.on_success[file_props.sid] = self._proxy_auth_ok raise nbxmpp.NodeProcessed

1 0

gajim: fix connection to FT proxies. Fixes #7349
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset adfc282c1c6b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=adfc282c1c6b description: fix connection to FT proxies. Fixes #7349 diffstat: src/common/socks5.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r f670c41b22bc -r adfc282c1c6b src/common/socks5.py --- a/src/common/socks5.py Sun Jul 28 18:03:57 2013 +0200 +++ b/src/common/socks5.py Sun Jul 07 14:22:37 2013 +0200 @@ -874,6 +874,10 @@ """ Get sha of sid + Initiator jid + Target jid """ + if self.file_props.is_a_proxy: + return hashlib.sha1('%s%s%s' % (self.sid, + self.file_props.proxy_sender, self.file_props.proxy_receiver) + ).hexdigest() return hashlib.sha1(('%s%s%s' % (self.sid, self.initiator, self.target)).encode('utf-8')).hexdigest()

1 0

gajim: load disco items slowly to now freeze with long list.
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 4381493b97b4 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4381493b97b4 description: load disco items slowly to now freeze with long list. diffstat: src/disco.py | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diffs (43 lines): diff -r adfc282c1c6b -r 4381493b97b4 src/disco.py --- a/src/disco.py Sun Jul 07 14:22:37 2013 +0200 +++ b/src/disco.py Mon Jul 08 14:51:50 2013 +0200 @@ -1109,16 +1109,29 @@ _('This service does not contain any items to browse.')) return # We got a list of items - self.window.services_treeview.set_model(None) - for item in items: - jid_ = item['jid'] - node_ = item.get('node', '') - # If such an item is already here: don't add it - if self._find_item(jid_, node_): - continue - self._total_items += 1 - self._add_item(jid_, node_, node, item, force) - self.window.services_treeview.set_model(self.model) + def fill_partial_rows(items): + '''Generator to fill the listmodel of a treeview progressively.''' + self.window.services_treeview.freeze_child_notify() + for item in items: + if self.window.dying: + yield False + jid_ = item['jid'] + node_ = item.get('node', '') + # If such an item is already here: don't add it + if self._find_item(jid_, node_): + continue + self._total_items += 1 + print 'adding item #', self._total_items + self._add_item(jid_, node_, node, item, force) + if (self._total_items % 10) == 0: + self.window.services_treeview.thaw_child_notify() + yield True + self.window.services_treeview.freeze_child_notify() + self.window.services_treeview.thaw_child_notify() + #stop idle_add() + yield False + loader = fill_partial_rows(items) + gobject.idle_add(loader.next) def _agent_info(self, jid, node, identities, features, data): """

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