Commits

commits@gajim.org

17632 discussions

gajim: bind session to a resource when negociating e2e encryptio...
by Gajim 15 Jul '15

15 Jul '15

changeset ce327758fd13 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ce327758fd13 description: bind session to a resource when negociating e2e encryption. Fixes #7993 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 8be22cc843f9 -r ce327758fd13 src/chat_control.py --- a/src/chat_control.py Sun Apr 05 21:26:16 2015 +0200 +++ b/src/chat_control.py Sun Apr 05 21:49:39 2015 +0200 @@ -3234,6 +3234,7 @@ def begin_e2e_negotiation(self): self.begin_negotiation() + self.session.resource = self.contact.resource self.session.negotiate_e2e(False) def begin_archiving_negotiation(self):

1 0

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

15 Jul '15

changeset 113485f5f126 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=113485f5f126 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 ce327758fd13 -r 113485f5f126 src/roster_window.py --- a/src/roster_window.py Sun Apr 05 21:49:39 2015 +0200 +++ b/src/roster_window.py Wed May 06 22:05:42 2015 +0200 @@ -5004,15 +5004,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): @@ -5020,6 +5012,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: clean corretly opened window dict. Fixes #7983
by Gajim 15 Jul '15

15 Jul '15

changeset fade7eb0d1d1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fade7eb0d1d1 description: clean corretly opened window dict. Fixes #7983 diffstat: src/dialogs.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (32 lines): diff -r 36bbc045577a -r fade7eb0d1d1 src/dialogs.py --- a/src/dialogs.py Tue Feb 10 12:57:49 2015 +0100 +++ b/src/dialogs.py Sat Feb 28 15:12:11 2015 +0100 @@ -2385,6 +2385,7 @@ this means room must be automaticaly configured and when done, invities must be automatically invited """ + self.window_account = None if account: if room_jid != '' and room_jid in gajim.gc_connected[account] and \ gajim.gc_connected[account][room_jid]: @@ -2396,6 +2397,7 @@ ErrorDialog(_('You are not connected to the server'), _('You can not join a group chat unless you are connected.')) raise GajimGeneralException('You must be connected to join a groupchat') + self.window_account = account self.xml = gtkgui_helpers.get_gtk_builder('join_groupchat_window.ui') @@ -2512,9 +2514,10 @@ self._nec_agent_info_received) gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, self._nec_agent_info_error_received) - if self.account and 'join_gc' in gajim.interface.instances[self.account]: + if self.window_account and 'join_gc' in gajim.interface.instances[ + self.window_account]: # remove us from open windows - del gajim.interface.instances[self.account]['join_gc'] + del gajim.interface.instances[self.window_account]['join_gc'] def on_join_groupchat_window_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: # ESCAPE

1 0

gajim: punyencode only the host part of the URL. Fixes #7981
by Gajim 15 Jul '15

15 Jul '15

changeset b325ae9b2ad0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b325ae9b2ad0 description: punyencode only the host part of the URL. Fixes #7981 diffstat: src/common/helpers.py | 9 +++++++++ src/conversation_textview.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diffs (40 lines): diff -r fade7eb0d1d1 -r b325ae9b2ad0 src/common/helpers.py --- a/src/common/helpers.py Sat Feb 28 15:12:11 2015 +0100 +++ b/src/common/helpers.py Sat Feb 28 15:47:51 2015 +0100 @@ -36,6 +36,7 @@ import subprocess import urllib import urllib +from urlparse import urlparse import webbrowser import errno import select @@ -137,6 +138,14 @@ converted_labels.append(idna.ToUnicode(label)) return ".".join(converted_labels) +def puny_encode_url(url): + _url = url + if '//' not in _url: + _url = '//' + _url + o = urlparse(_url) + p_loc = idn_to_ascii(o.netloc) + return url.replace(o.netloc, p_loc) + def parse_resource(resource): """ Perform stringprep on resource and return it diff -r fade7eb0d1d1 -r b325ae9b2ad0 src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 28 15:12:11 2015 +0100 +++ b/src/conversation_textview.py Sat Feb 28 15:47:51 2015 +0100 @@ -1218,8 +1218,8 @@ all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] buffer_.insert_with_tags(end_iter, special_text, *all_tags) if 'url' in tags: - puny_text = puny_encode(special_text).decode('utf-8') - if not puny_text.endswith('-'): + puny_text = helpers.puny_encode_url(special_text) + if puny_text != special_text: puny_tags = [] if use_other_tags: puny_tags += other_tags

1 0

gajim: prepare 0.16.1 release
by Gajim 15 Jul '15

15 Jul '15

changeset ad1fb13f868e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ad1fb13f868e description: prepare 0.16.1 release diffstat: ChangeLog | 3 ++- autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diffs (36 lines): diff -r b325ae9b2ad0 -r ad1fb13f868e ChangeLog --- a/ChangeLog Sat Feb 28 15:47:51 2015 +0100 +++ b/ChangeLog Sat Feb 28 18:06:36 2015 +0100 @@ -1,8 +1,9 @@ -Gajim 0.16.1 () +Gajim 0.16.1 (28 February 2015) * Fix sending Zeroconf messages * Make ipython compatible to version >= 1.0 * Support XEP-0313 MAM + * Minor fixes and improvements Gajim 0.16 (04 October 2014) diff -r b325ae9b2ad0 -r ad1fb13f868e autogen.sh --- a/autogen.sh Sat Feb 28 15:47:51 2015 +0100 +++ b/autogen.sh Sat Feb 28 18:06:36 2015 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16" + gajimversion="0.16.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r b325ae9b2ad0 -r ad1fb13f868e src/common/defs.py --- a/src/common/defs.py Sat Feb 28 15:47:51 2015 +0100 +++ b/src/common/defs.py Sat Feb 28 18:06:36 2015 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.0.1' +version = '0.16.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: gtk-spell-check icon is not available under windows
by Gajim 15 Jul '15

15 Jul '15

changeset 3194cf725d66 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3194cf725d66 description: gtk-spell-check icon is not available under windows diffstat: icons/hicolor/16x16/actions/gajim-message_corrected.png | Bin src/conversation_textview.py | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (19 lines): diff -r ad1fb13f868e -r 3194cf725d66 icons/hicolor/16x16/actions/gajim-message_corrected.png Binary file icons/hicolor/16x16/actions/gajim-message_corrected.png has changed diff -r ad1fb13f868e -r 3194cf725d66 src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 28 18:06:36 2015 +0100 +++ b/src/conversation_textview.py Sat Feb 28 22:22:14 2015 +0100 @@ -173,7 +173,12 @@ ) ) - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check', + quiet=True) + if not MESSAGE_CORRECTED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-message_corrected') + # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds

1 0

gajim: update debian folder
by Gajim 15 Jul '15

15 Jul '15

changeset 36b06ce3023f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=36b06ce3023f description: update debian folder diffstat: debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 3194cf725d66 -r 36b06ce3023f debian/changelog --- a/debian/changelog Sat Feb 28 22:22:14 2015 +0100 +++ b/debian/changelog Sat Feb 28 22:30:39 2015 +0100 @@ -1,3 +1,9 @@ +gajim (0.16.1-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 28 Feb 2014 22:30:10 +0200 + gajim (0.16-1) unstable; urgency=low * New upstream release

1 0

gajim: Added tag gajim-0.16.1 for changeset 33a5521fed87
by Gajim 15 Jul '15

15 Jul '15

changeset 18ac1d3ef7c2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=18ac1d3ef7c2 description: Added tag gajim-0.16.1 for changeset 33a5521fed87 diffstat: .hgtags | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 36b06ce3023f -r 18ac1d3ef7c2 .hgtags --- a/.hgtags Sat Feb 28 22:30:39 2015 +0100 +++ b/.hgtags Sat Feb 28 22:43:01 2015 +0100 @@ -6,3 +6,11 @@ 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1 50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1 +7538b7eff0cd2adf455beb78c206c5ffb81ba2f0 gajim-0.16-alpha1 +e2731a8cd582d3541bc8383e12a4775c8f229d65 gajim-0.16-alpha2 +a0b59d4aadced51b902783d75d64461aa41bf7a3 gajim-0.16-beta1 +9931beb5eec2c6fce4d7c9d1094375d05ac321de gajim-0.16-beta2 +f4acdfbbe30bd29b832a34c14bd18ade9be9845d gajim-0.16-rc1 +129d3cce62cb497e490fef80e56bf97f57dc098b gajim-0.16-rc2 +f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 +33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1

1 0

gajim: fix seclabel. see #7010
by Gajim 15 Jul '15

15 Jul '15

changeset 9b500bc813bc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9b500bc813bc description: fix seclabel. see #7010 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 18ac1d3ef7c2 -r 9b500bc813bc src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Feb 28 22:43:01 2015 +0100 +++ b/src/common/connection_handlers.py Sun Mar 01 15:07:14 2015 +0100 @@ -1621,7 +1621,7 @@ def seclabel_catalogue_request(self, to, callback): if to not in self.seclabel_catalogues: - self.seclabel_catalogues[to] = [[], None, None] + self.seclabel_catalogues[to] = [[], None, None, None] self.seclabel_catalogues[to][0].append(callback) def _rosterSetCB(self, con, iq_obj):

1 0

gajim: don't request privacy lists when connecting if server doe...
by Gajim 15 Jul '15

15 Jul '15

changeset 975912558ebf in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=975912558ebf description: don't request privacy lists when connecting if server doesn't support that. Fixes #7990 diffstat: src/common/connection.py | 41 ++++++++++++++++++++++++++++++++------ src/common/connection_handlers.py | 30 +++++---------------------- 2 files changed, 40 insertions(+), 31 deletions(-) diffs (118 lines): diff -r 9b500bc813bc -r 975912558ebf src/common/connection.py --- a/src/common/connection.py Sun Mar 01 15:07:14 2015 +0100 +++ b/src/common/connection.py Sat Mar 07 15:04:41 2015 +0100 @@ -1855,7 +1855,6 @@ if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule - self.privacy_rules_supported = True self.activate_privacy_rule('invisible') self.connected = gajim.SHOW_LIST.index('invisible') self.status = msg @@ -1933,13 +1932,40 @@ self.awaiting_answers[id_] = (PRIVACY_ARRIVED, ) self.connection.send(iq) + def _continue_connection_request_privacy(self): + if self.privacy_rules_supported: + if not self.privacy_rules_requested: + self.privacy_rules_requested = True + self._request_privacy() + else: + if self.continue_connect_info and self.continue_connect_info[0]\ + == 'invisible': + # Trying to login as invisible but privacy list not + # supported + self.disconnect(on_purpose=True) + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='offline')) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', pri_txt=_('Invisibility not ' + 'supported'), sec_txt=_('Account %s doesn\'t support ' + 'invisibility.') % self.name)) + return + if self.blocking_supported: + iq = nbxmpp.Iq('get', xmlns='') + query = iq.setQuery(name='blocklist') + query.setNamespace(nbxmpp.NS_BLOCKING) + id2_ = self.connection.getAnID() + iq.setID(id2_) + self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) + self.connection.send(iq) + # Ask metacontacts before roster + self.get_metacontacts() + def _nec_agent_info_error_received(self, obj): if obj.conn.name != self.name: return if obj.id_[:6] == 'Gajim_': - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() + self._continue_connection_request_privacy() def _nec_agent_info_received(self, obj): if obj.conn.name != self.name: @@ -2010,6 +2036,9 @@ iq = nbxmpp.Iq('set') iq.setTag('enable', namespace=nbxmpp.NS_CARBONS) self.connection.send(iq) + if nbxmpp.NS_PRIVACY in obj.features: + self.privacy_rules_supported = True + if nbxmpp.NS_BYTESTREAM in obj.features and \ gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): our_fjid = helpers.parse_jid(our_jid + '/' + \ @@ -2026,9 +2055,7 @@ self.available_transports[transport_type].append(obj.fjid) else: self.available_transports[transport_type] = [obj.fjid] - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() + self._continue_connection_request_privacy() def send_custom_status(self, show, msg, jid): if not show in gajim.SHOW_LIST: diff -r 9b500bc813bc -r 975912558ebf src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Mar 01 15:07:14 2015 +0100 +++ b/src/common/connection_handlers.py Sat Mar 07 15:04:41 2015 +0100 @@ -574,32 +574,14 @@ elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() != 'error': - self.privacy_rules_supported = True self.get_privacy_list('block') + # Ask metacontacts before roster + self.get_metacontacts() else: - if self.blocking_supported: - iq = nbxmpp.Iq('get', xmlns='') - query = iq.setQuery(name='blocklist') - query.setNamespace(nbxmpp.NS_BLOCKING) - id2_ = self.connection.getAnID() - iq.setID(id2_) - self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) - self.connection.send(iq) - - if self.continue_connect_info and self.continue_connect_info[0]\ - == 'invisible': - # Trying to login as invisible but privacy list not - # supported - self.disconnect(on_purpose=True) - gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) - gajim.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', pri_txt=_('Invisibility not ' - 'supported'), sec_txt=_('Account %s doesn\'t support ' - 'invisibility.') % self.name)) - return - # Ask metacontacts before roster - self.get_metacontacts() + # That should never happen, but as it's blocking in the + # connection process, we don't take the risk + self.privacy_rules_supported = False + self._continue_connection_request_privacy() elif self.awaiting_answers[id_][0] == BLOCKING_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() == 'result':

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