Commits

commits@gajim.org

17632 discussions

gajim: make the Ok button of Insecure connection dialog insensit...
by Yann Leboulanger 18 Jul '13

18 Jul '13

changeset 1b27a435304d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1b27a435304d description: make the Ok button of Insecure connection dialog insensitive when yes checkbox is not checked. Fixes #7373 diffstat: src/dialogs.py | 25 +++++++++++++++++++++++++ src/gui_interface.py | 14 +------------- 2 files changed, 26 insertions(+), 13 deletions(-) diffs (63 lines): diff -r aade71293084 -r 1b27a435304d src/dialogs.py --- a/src/dialogs.py Thu Jul 18 17:04:59 2013 +0200 +++ b/src/dialogs.py Thu Jul 18 20:32:45 2013 +0200 @@ -1826,6 +1826,31 @@ is_checked_2 = False return [is_checked_1, is_checked_2] +class PlainConnectionDialog(ConfirmationDialogDoubleCheck): + """ + Dialog that is shown when using an insecure connection + """ + def __init__(self, account, on_ok, on_cancel): + pritext = _('Insecure connection') + sectext = _('You are about to connect to the account %(account)s ' + '(%(server)s) with an insecure connection. This means all your ' + 'conversations will be exchanged unencrypted. This type of ' + 'connection is really discouraged.\nAre you sure you want to do ' + 'that?') % {'account': account, + 'server': gajim.get_hostname_from_account(account)} + checktext1 = _('Yes, I really want to connect insecurely') + tooltip1 = _('Gajim will NOT connect unless you check this box') + checktext2 = _('_Do not ask me again') + ConfirmationDialogDoubleCheck.__init__(self, pritext, sectext, + checktext1, checktext2, tooltip1=tooltip1, on_response_ok=on_ok, + on_response_cancel=on_cancel, is_modal=False) + self.ok_button = self.action_area.get_children()[0] # right to left + self.ok_button.set_sensitive(False) + self.checkbutton1.connect('clicked', self.on_checkbutton_clicked) + + def on_checkbutton_clicked(self, widget): + self.ok_button.set_sensitive(widget.get_active()) + class ConfirmationDialogDoubleRadio(ConfirmationDialog): """ HIG compliant confirmation dialog with 2 radios diff -r aade71293084 -r 1b27a435304d src/gui_interface.py --- a/src/gui_interface.py Thu Jul 18 17:04:59 2013 +0200 +++ b/src/gui_interface.py Thu Jul 18 20:32:45 2013 +0200 @@ -1409,23 +1409,11 @@ gajim.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, show='offline')) - pritext = _('Insecure connection') - sectext = _('You are about to connect to the account %(account)s ' - '(%(server)s) with an insecure connection. This means all your ' - 'conversations will be exchanged unencrypted. This type of ' - 'connection is really discouraged.\nAre you sure you want to do ' - 'that?') % {'account': obj.conn.name, - 'server': gajim.get_hostname_from_account(obj.conn.name)} - checktext1 = _('Yes, I really want to connect insecurely') - tooltip1 = _('Gajim will NOT connect unless you check this box') - checktext2 = _('_Do not ask me again') if 'plain_connection' in self.instances[obj.conn.name]['online_dialog']: self.instances[obj.conn.name]['online_dialog']['plain_connection'].\ destroy() self.instances[obj.conn.name]['online_dialog']['plain_connection'] = \ - dialogs.ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, - checktext2, tooltip1=tooltip1, on_response_ok=on_ok, - on_response_cancel=on_cancel, is_modal=False) + dialogs.PlainConnectionDialog(obj.conn.name, on_ok, on_cancel) def handle_event_insecure_ssl_connection(self, obj): # ('INSECURE_SSL_CONNECTION', account, (connection, connection_type))

1 0

gajim: ability to write several JIDs in sender field of send sin...
by Yann Leboulanger 18 Jul '13

18 Jul '13

changeset aade71293084 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=aade71293084 description: ability to write several JIDs in sender field of send single message dialog. fixes #7206 diffstat: src/dialogs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a2cf59474a83 -r aade71293084 src/dialogs.py --- a/src/dialogs.py Thu Jul 18 14:32:45 2013 +0200 +++ b/src/dialogs.py Thu Jul 18 17:04:59 2013 +0200 @@ -3136,7 +3136,8 @@ else: sender_list.append(i[0].jid) else: - sender_list = [self.to_entry.get_text().decode('utf-8')] + sender_list = [j.strip() for j in self.to_entry.get_text().decode( + 'utf-8').split(',')] for to_whom_jid in sender_list: if to_whom_jid in self.completion_dict:

1 0

gajim: fix receiving a carbon of a sent message without a from.
by Yann Leboulanger 18 Jul '13

18 Jul '13

changeset a2cf59474a83 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a2cf59474a83 description: fix receiving a carbon of a sent message without a from. diffstat: src/common/connection_handlers_events.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r b09d5d9fb00a -r a2cf59474a83 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jul 18 14:03:13 2013 +0200 +++ b/src/common/connection_handlers_events.py Thu Jul 18 14:32:45 2013 +0200 @@ -1055,7 +1055,10 @@ self.stanza = nbxmpp.Message(node=msg) if carbon_marker.getName() == 'sent': to = self.stanza.getTo() - self.stanza.setTo(self.stanza.getFrom()) + frm = self.stanza.getFrom() + if not frm: + frm = gajim.get_jid_from_account(account) + self.stanza.setTo(frm) self.stanza.setFrom(to) self.sent = True try:

1 0

gajim: support version 2 of message carbons
by Yann Leboulanger 18 Jul '13

18 Jul '13

changeset b09d5d9fb00a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b09d5d9fb00a description: support version 2 of message carbons diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f01f35ecc7d5 -r b09d5d9fb00a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jul 18 13:39:14 2013 +0200 +++ b/src/common/connection_handlers_events.py Thu Jul 18 14:03:13 2013 +0200 @@ -1048,7 +1048,7 @@ namespace=nbxmpp.NS_CARBONS) # Be sure it comes from one of our resource, else ignore forward element if carbon_marker and self.jid == gajim.get_jid_from_account(account): - forward_tag = self.stanza.getTag('forwarded', + forward_tag = carbon_marker.getTag('forwarded', namespace=nbxmpp.NS_FORWARD) if forward_tag: msg = forward_tag.getTag('message')

1 0

python-nbxmpp: update carbon namespace to v2
by Yann Leboulanger 18 Jul '13

18 Jul '13

changeset 1fd84376949e in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=1fd84376949e description: update carbon namespace to v2 diffstat: nbxmpp/protocol.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a741a3e9bfe6 -r 1fd84376949e nbxmpp/protocol.py --- a/nbxmpp/protocol.py Tue Jun 04 22:57:11 2013 +0200 +++ b/nbxmpp/protocol.py Thu Jul 18 14:02:48 2013 +0200 @@ -53,7 +53,7 @@ NS_BYTESTREAM = 'http://jabber.org/protocol/bytestreams' # XEP-0065 NS_CAPS = 'http://jabber.org/protocol/caps' # XEP-0115 NS_CAPTCHA = 'urn:xmpp:captcha' # XEP-0158 -NS_CARBONS = 'urn:xmpp:carbons:1' # XEP-0280 +NS_CARBONS = 'urn:xmpp:carbons:2' # XEP-0280 NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # XEP-0085 NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194 NS_CLIENT = 'jabber:client'

1 0

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

18 Jul '13

changeset f01f35ecc7d5 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f01f35ecc7d5 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 6e582828f048 -r f01f35ecc7d5 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 @@ -266,7 +266,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: @@ -282,7 +282,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-website: update windows d/l link
by Yann Leboulanger 18 Jul '13

18 Jul '13

changeset 1a44320d934e in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=1a44320d934e description: update windows d/l link diffstat: downloads.php | 2 +- locale/fr_FR/LC_MESSAGES/msg.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 5503b3ec91e0 -r 1a44320d934e downloads.php --- a/downloads.php Sun Jun 09 15:42:35 2013 +0200 +++ b/downloads.php Thu Jul 18 10:43:35 2013 +0200 @@ -145,7 +145,7 @@ print (" </h2>\n"); print ("</a>\n"); #print _("Installer for 0.14 will be available as soon as possible. Currently available:")." <a href=\"downloads/0.13/gajim-0.13.4-2.exe\">"._("Gajim 0.13.4 installer")."</a>.\n"; -print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; +print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-3.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" <br/>\n"); #print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta4-2.exe\">"._("Gajim installer")."</a> "; diff -r 5503b3ec91e0 -r 1a44320d934e locale/fr_FR/LC_MESSAGES/msg.po --- a/locale/fr_FR/LC_MESSAGES/msg.po Sun Jun 09 15:42:35 2013 +0200 +++ b/locale/fr_FR/LC_MESSAGES/msg.po Thu Jul 18 10:43:35 2013 +0200 @@ -641,7 +641,7 @@ "released under the GNU General Public License. If you find bugs or have " "ideas on how Gajim can be better, " msgstr "" -"Le but de Gajim est de fournir un client Jabber complet et facile à " +"Le but de Gajim est de fournir un client Jabber/XMPP complet et facile à " "utiliser. Gajim cohabite très bien avec GNOME, mais ne le nécessite pas pour " "fonctionner. Gajim est distribué sous la licence GNU GPL. Si vous trouvez " "des bogues ou si vous avez des idées pour améliorer Gajim, "

1 0

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

17 Jul '13

changeset 6e582828f048 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6e582828f048 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 456743214f35 -r 6e582828f048 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: don't crash when GPG key are badly encrypted
by Yann Leboulanger 17 Jul '13

17 Jul '13

changeset 456743214f35 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=456743214f35 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 e23d3603521f -r 456743214f35 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: read assigned GPG key when creating the contacts. fixes: ...
by Yann Leboulanger 16 Jul '13

16 Jul '13

changeset e23d3603521f in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e23d3603521f 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 3a8a6f07b98e -r e23d3603521f 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

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