Commits June 2017

commits@gajim.org

1 participants
45 discussions

[Git][gajim/gajim][gajim_0.16] Update Version
by Philipp Hörist 03 Jun '17

03 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: b4884437 by Philipp Hörist at 2017-06-03T23:33:42+02:00 Update Version - - - - - 6 changed files: - appveyor.yml - autogen.sh - debian/changelog - gajim.nsi - setup_win32.py - src/common/defs.py Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -62,8 +62,8 @@ install: # Push Installer Exe - ps: $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() - - ps: Push-AppveyorArtifact Gajim.exe -FileName "Gajim-0.16.7-$($env:TIME_STRING).exe" - - ps: Push-AppveyorArtifact Gajim-Portable.exe -FileName "Gajim-portable-0.16.7-$($env:TIME_STRING).exe" + - ps: Push-AppveyorArtifact Gajim.exe -FileName "Gajim-0.16.8-$($env:TIME_STRING).exe" + - ps: Push-AppveyorArtifact Gajim-Portable.exe -FileName "Gajim-portable-0.16.8-$($env:TIME_STRING).exe" build: off ===================================== autogen.sh ===================================== --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.7" + gajimversion="0.16.8" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gajim (0.16.8-1) unstable; urgency=low + + * New upstream release + + -- Philipp Hoerist <philipp(a)hoerist.com> Sat, 03 Jun 2017 23:30:00 +0200 + gajim (0.16.7-1) unstable; urgency=low * New upstream release ===================================== gajim.nsi ===================================== --- a/gajim.nsi +++ b/gajim.nsi @@ -164,7 +164,7 @@ Section "Gajim" SecGajim WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.7" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.8" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" ===================================== setup_win32.py ===================================== --- a/setup_win32.py +++ b/setup_win32.py @@ -44,7 +44,7 @@ options = { setup( name='Gajim', - version='0.16.7', + version='0.16.8', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/', ===================================== src/common/defs.py ===================================== --- a/src/common/defs.py +++ b/src/common/defs.py @@ -30,7 +30,7 @@ import os.path docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.7' +version = '0.16.8' try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b4884437063feb269e851c23be8927e397…

1 0

[Git][gajim/gajim][gajim_0.16] Update ChangeLog
by Philipp Hörist 03 Jun '17

03 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: d8eb1197 by Philipp Hörist at 2017-06-03T23:20:25+02:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Gajim 0.16.8 (04 June 2017) + + * Fix rejoining MUCs after connection loss + * Fix Groupchat invites + * Fix encoding problems with newer GnuPG versions + * Fix old messages randomly reappearing in the chat window + * Fix some problems with IBB filetransfer + * Make XEP-0146 Commands opt-in + * Improve sending messages to your own resources + * Improve reliability of delivery recipes + * Many minor bugfixes + Gajim 0.16.7 (30 January 2017) * Better compatibility with XEP-0191: Blocking Command View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d8eb11972d694cef006f20ecdae168b108…

1 0

[Git][gajim/gajim][master] Dont save sent MessageStanza for LMC use
by Philipp Hörist 02 Jun '17

02 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ef822961 by Philipp Hörist at 2017-06-02T03:32:46+02:00 Dont save sent MessageStanza for LMC use There are mutliple reasons why this is not a good idea 1. It places work on encryption Plugins, as many encryption attributes inside the stanza can not be resend again (OMEMO, OTR), so the plugins have to make sure none of these attr are inside the LMC stanza 2. In general its not obvious for plugin devs that a stanza issued after LMC has to be treated differently. There should be no negative effects, even when a contributor not knowing about LMC at all. This commit saves only the stanza id, and adds the replace tag on the new message. This results also in less code. - - - - - 5 changed files: - src/chat_control.py - src/chat_control_base.py - src/common/connection.py - src/common/connection_handlers_events.py - src/groupchat_control.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -931,7 +931,7 @@ class ChatControl(ChatControlBase): self.print_conversation(message, self.contact.jid, encrypted=encrypted, xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking, msg_stanza_id=id_, - correct_id=msg_stanza.getTagAttr('replace', 'id'), + correct_id=obj.correct_id, additional_data=obj.additional_data) ChatControlBase.send_message(self, message, keyID, type_='chat', ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -752,21 +752,21 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): label = self.get_seclabel() def _cb(obj, msg, cb, *cb_args): - self.last_sent_msg = msg + self.last_sent_msg = obj.msg_id if cb: cb(obj, msg, *cb_args) if self.correcting and self.last_sent_msg: - correction_msg = self.last_sent_msg + correct_id = self.last_sent_msg else: - correction_msg = None + correct_id = None gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, message=message, keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, resource=resource, user_nick=self.user_nick, xhtml=xhtml, label=label, callback=_cb, callback_args=[callback] + callback_args, - control=self, attention=attention, correction_msg=correction_msg, + control=self, attention=attention, correct_id=correct_id, automatic_message=False, encryption=self.encryption)) # Record the history of sent messages ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -304,24 +304,6 @@ class CommonConnection: else: fjid = obj.get_full_jid() - if obj.correction_msg: - id_ = obj.correction_msg.getID() - if obj.correction_msg.getTag('replace'): - obj.correction_msg.delChild('replace') - obj.correction_msg.setTag('replace', attrs={'id': id_}, - namespace=nbxmpp.NS_CORRECT) - id2 = self.connection.getAnID() - obj.correction_msg.setID(id2) - obj.correction_msg.setBody(obj.message) - if obj.xhtml: - obj.correction_msg.setXHTML(obj.xhtml) - - if obj.session: - obj.session.last_send = time.time() - - self._push_stanza_message_outgoing(obj, obj.correction_msg) - return - if obj.type_ == 'chat': msg_iq = nbxmpp.Message(body=obj.message, typ=obj.type_, xhtml=obj.xhtml) @@ -333,6 +315,10 @@ class CommonConnection: msg_iq = nbxmpp.Message(body=obj.message, typ='normal', xhtml=obj.xhtml) + if obj.correct_id: + msg_iq.setTag('replace', attrs={'id': obj.correct_id}, + namespace=nbxmpp.NS_CORRECT) + if obj.msg_id: msg_iq.setID(obj.msg_id) @@ -2637,39 +2623,25 @@ class Connection(CommonConnection, ConnectionHandlers): if not gajim.account_is_connected(self.name): return - if obj.correction_msg: - id_ = obj.correction_msg.getID() - if obj.correction_msg.getTag('replace'): - obj.correction_msg.delChild('replace') - obj.correction_msg.setTag('replace', attrs={'id': id_}, - namespace=nbxmpp.NS_CORRECT) - id2 = self.connection.getAnID() - obj.correction_msg.setID(id2) - obj.correction_msg.setBody(obj.message) - if obj.xhtml: - obj.correction_msg.setXHTML(xhtml) - gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( - None, conn=self, automatic_message=obj.automatic_message, - jid=obj.jid, message=obj.message, - correction_msg=obj.correction_msg, additional_data=obj.additional_data)) - if obj.callback: - obj.callback(obj.correction_msg, obj.message) - return if not obj.xhtml and gajim.config.get('rst_formatting_outgoing_messages'): from common.rst_xhtml_generator import create_xhtml obj.xhtml = create_xhtml(obj.message) + msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', xhtml=obj.xhtml) + + if obj.correct_id: + msg_iq.setTag('replace', attrs={'id': obj.correct_id}, + namespace=nbxmpp.NS_CORRECT) + if obj.chatstate: msg_iq.setTag(obj.chatstate, namespace=nbxmpp.NS_CHATSTATES) if obj.label is not None: msg_iq.addChild(node=obj.label) - gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( - None, conn=self, msg_iq=msg_iq, - automatic_message=obj.automatic_message, - jid=obj.jid, message=obj.message, correction_msg=None, additional_data=obj.additional_data)) - if obj.callback: - obj.callback(msg_iq, obj.message) + + obj.msg_iq = msg_iq + obj.conn = self + gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent(None, **vars(obj))) def _nec_gc_stanza_message_outgoing(self, obj): if obj.conn.name != self.name: @@ -2684,14 +2656,13 @@ class Connection(CommonConnection, ConnectionHandlers): self.send_gc_message(obj) def send_gc_message(self, obj): - if obj.correction_msg: - obj.msg_id = self.connection.send(obj.correction_msg) - else: - obj.msg_id = self.connection.send(obj.msg_iq) + obj.msg_id = self.connection.send(obj.msg_iq) gajim.nec.push_incoming_event(MessageSentEvent( None, conn=self, jid=obj.jid, message=obj.message, keyID=None, chatstate=None, automatic_message=obj.automatic_message, msg_id=obj.msg_id, additional_data=obj.additional_data)) + if obj.callback: + obj.callback(obj) def send_gc_subject(self, jid, subject): if not gajim.account_is_connected(self.name): ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -2749,7 +2749,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): self.is_loggable = True self.control = None self.attention = False - self.correction_msg = None + self.correct_id = None self.automatic_message = True self.encryption = '' @@ -2791,7 +2791,7 @@ class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): self.callback_args = [] self.is_loggable = True self.control = None - self.correction_msg = None + self.correct_id = None self.automatic_message = True def generate(self): ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -2035,24 +2035,23 @@ class GroupchatControl(ChatControlBase): if message != '' or message != '\n': self.save_message(message, 'sent') - def _cb(msg, msg_txt): + def _cb(obj): # we'll save sent message text when we'll receive it in # _nec_gc_message_received - self.last_sent_msg = msg + self.last_sent_msg = obj.msg_id if self.correcting: self.correcting = False gtkgui_helpers.remove_css_class( self.msg_textview, 'msgcorrectingcolor') if self.correcting and self.last_sent_msg: - correction_msg = self.last_sent_msg + correct_id = self.last_sent_msg else: - correction_msg = None + correct_id = None # Send the message gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, account=self.account, jid=self.room_jid, message=message, - xhtml=xhtml, label=label, callback=_cb, - callback_args=[_cb] + [message], correction_msg=correction_msg, + xhtml=xhtml, label=label, callback=_cb, correct_id=correct_id, automatic_message=False)) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef8229615afd7200a30cf908a0aa725a9f…

1 0

[Git][gajim/gajim][gajim_0.16] Rejoin MUCs unconditionally on SignedInEvent
by Philipp Hörist 01 Jun '17

01 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: d3437d61 by Philipp Hörist at 2017-06-01T20:33:39+02:00 Rejoin MUCs unconditionally on SignedInEvent There is no reason that any Groupchat should be treated as already connected when we sign in. - - - - - 1 changed file: - src/groupchat_control.py Changes: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1365,9 +1365,6 @@ class GroupchatControl(ChatControlBase): def _nec_signed_in(self, obj): if obj.conn.name != self.account: return - if self.room_jid in gajim.gc_connected[obj.conn.name] and \ - gajim.gc_connected[obj.conn.name][self.room_jid]: - return password = gajim.gc_passwords.get(self.room_jid, '') obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d3437d61cba9e1f368f47beca0f800131e…

1 0

[Git][gajim/gajim][master] Rejoin MUCs unconditionally on SignedInEvent
by Philipp Hörist 01 Jun '17

01 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f803b544 by Philipp Hörist at 2017-06-01T19:10:06+02:00 Rejoin MUCs unconditionally on SignedInEvent There is no reason that any Groupchat should be treated as already connected when we sign in. - - - - - 1 changed file: - src/groupchat_control.py Changes: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1378,9 +1378,6 @@ class GroupchatControl(ChatControlBase): def _nec_signed_in(self, obj): if obj.conn.name != self.account: return - if self.room_jid in gajim.gc_connected[obj.conn.name] and \ - gajim.gc_connected[obj.conn.name][self.room_jid]: - return password = gajim.gc_passwords.get(self.room_jid, '') obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f803b544bc57d12bc547ff9515bd072043…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2017