Commits October 2018

commits@gajim.org

1 participants
107 discussions

[Git][gajim/gajim][master] Add debug commandline options
by Philipp Hörist 03 Oct '18

03 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e6641858 by Philipp Hörist at 2018-10-03T10:28:11Z Add debug commandline options To easier simulate connectivity loss - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -138,6 +138,21 @@ class GajimApplication(Gtk.Application): GLib.OptionArg.NONE, _('Start a new chat')) + self.add_main_option( + 'simulate-network-lost', + 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Simulate loss of connectivity')) + + self.add_main_option( + 'simulate-network-connected', + 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Simulate regaining connectivity')) + + self.add_main_option_entries(self._get_remaining_entry()) self.connect('handle-local-options', self._handle_local_options) @@ -255,10 +270,11 @@ class GajimApplication(Gtk.Application): # Parse all options that should be executed on a remote instance options = command_line.get_options_dict() - remote_commands = ['ipython', - 'show-next-pending-event', - 'start-chat', - ] + remote_commands = [ + 'ipython', + 'show-next-pending-event', + 'start-chat', + ] remaining = options.lookup_value(GLib.OPTION_REMAINING, GLib.VariantType.new('as')) @@ -268,6 +284,14 @@ class GajimApplication(Gtk.Application): self.activate_action(cmd) return 0 + if options.contains('simulate-network-lost'): + app.interface.network_status_changed(None, False) + return 0 + + if options.contains('simulate-network-connected'): + app.interface.network_status_changed(None, True) + return 0 + if remaining is not None: self._open_uris(remaining.unpack()) return 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e6641858454c8aaf817137ce6a2650d1c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e6641858454c8aaf817137ce6a2650d1c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Set active chatstate on messages
by Philipp Hörist 03 Oct '18

03 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b7aae56 by Philipp Hörist at 2018-10-03T07:56:56Z MUC: Set active chatstate on messages - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -166,12 +166,13 @@ class Chatstate: if setting == 'disabled': return None - # Dont send chatstates to ourself - if self._con.get_own_jid().bareMatch(contact.jid): - return None + if not contact.is_groupchat(): + # Dont send chatstates to ourself + if self._con.get_own_jid().bareMatch(contact.jid): + return None - if not contact.supports(nbxmpp.NS_CHATSTATES): - return None + if not contact.supports(nbxmpp.NS_CHATSTATES): + return None self.set_active(contact.jid) return 'active' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b7aae564b98a333848929aa1f638a29aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b7aae564b98a333848929aa1f638a29aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix the fix
by Philipp Hörist 03 Oct '18

03 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b6c43c90 by Philipp Hörist at 2018-10-03T06:08:32Z Fix the fix - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -647,7 +647,7 @@ class Connection(CommonConnection, ConnectionHandlers): if self.old_show: self.connected = app.SHOW_LIST.index(self.old_show) app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show=app.SHOW_LIST[self.old_show])) + None, conn=self, show=self.old_show)) else: # we default to online self.connected = 2 app.nec.push_incoming_event(OurShowEvent( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6c43c90666d800fe3896656d1bf80ee8c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6c43c90666d800fe3896656d1bf80ee8c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pylint CI improvements
by Philipp Hörist 03 Oct '18

03 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 237abf74 by Marcin Mielniczuk at 2018-10-03T05:58:54Z Pylint CI improvements * Move the pylint CI configuration to a separate script * Update pylint in CI to 2.1.1 * Add pycurl to pylint whitelist - - - - - 5 changed files: - .gitlab-ci.yml - gajim/common/connection.py - pylintrc - scripts/dev/pre-push-tests.sh - + scripts/dev/pylint-ci.sh Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,6 +1,7 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly pylint3 python3-cairo + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly python3-cairo python3-pip - sudo apt-get build-dep -y -qq gajim-default-nightly + - sudo pip3 install pylint==2.1.1 stages: - test @@ -19,7 +20,9 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 gajim + - pylint3 --version + - pylint --version + - scripts/dev/pylint-ci.sh --jobs=2 gajim run-build: stage: build ===================================== gajim/common/connection.py ===================================== @@ -1031,7 +1031,7 @@ class Connection(CommonConnection, ConnectionHandlers): nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ self.try_connecting_for_foo_secs # FIXME: this is a hack; need a better way - if self.on_connect_success == self._on_new_account: + if self.on_connect_success == self._on_new_account: # pylint: disable=comparison-with-callable con.RegisterDisconnectHandler(self._on_new_account) if self.client_cert and app.config.get_per('accounts', self.name, ===================================== pylintrc ===================================== @@ -3,7 +3,7 @@ # A comma-separated list of package or module names from where C extensions may # be loaded. Extensions are loading into the active Python interpreter and may # run arbitrary code -extension-pkg-whitelist= +extension-pkg-whitelist=pycurl # Add files or directories to the blacklist. They should be base names, not # paths. ===================================== scripts/dev/pre-push-tests.sh ===================================== @@ -1,38 +1,4 @@ -mypy gajim -pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 gajim +SCRIPTDIR=$(dirname $0) -# C0103 invalid-name -# C0302 too-many-lines -# C0330 bad-continuation -# C0411 wrong-import-order -# C0412 ungrouped-imports -# C0413 wrong-import-position -# E0203 access-member-before-definition -# E0401 import-error -# E0611 no-name-in-module -# E0710 raising-non-exception - GLib.GError is not recognized -# E0712 catching-non-exception - GLib.GError is not recognized -# E1101 no-member -# E1102 not-callable -# E1128 assignment-from-none -# E1133 not-an-iterable -# E1136 unsubscriptable-object -# R0201 no-self-use -# R0901 too-many-ancestors -# R0904 too-many-public-methods -# R0913 too-many-arguments -# R0916 too-many-boolean-expressions -# R1702 -# R1706 -# R1711 -# R1716 -# W0143 comparison-with-callable - Dont add to Server CI, only available on pylint 2.0+ -# W0201 attribute-defined-outside-init -# W0212 protected-access -# W0221 arguments-differ -# W0223 abstract-method -# W0311 bad-indentation -# W0401 wildcard-import -# W0603 global-statement -# W0613 unused-argument -# W0614 unused-wildcard-import \ No newline at end of file +mypy gajim +${SCRIPTDIR}/pylint-ci.sh --jobs=0 gajim ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -0,0 +1,39 @@ +#!/bin/sh +PYLINT=${PYLINT:-pylint} + +"$PYLINT" --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 "$@" + +# C0103 invalid-name +# C0302 too-many-lines +# C0330 bad-continuation +# C0411 wrong-import-order +# C0412 ungrouped-imports +# C0413 wrong-import-position +# E0203 access-member-before-definition +# E0401 import-error +# E0611 no-name-in-module +# E0710 raising-non-exception - GLib.GError is not recognized +# E0712 catching-non-exception - GLib.GError is not recognized +# E1101 no-member +# E1102 not-callable +# E1128 assignment-from-none +# E1133 not-an-iterable +# E1136 unsubscriptable-object +# R0201 no-self-use +# R0901 too-many-ancestors +# R0904 too-many-public-methods +# R0913 too-many-arguments +# R0916 too-many-boolean-expressions +# R1702 +# R1706 +# R1711 +# R1716 +# W0201 attribute-defined-outside-init +# W0212 protected-access +# W0221 arguments-differ +# W0223 abstract-method +# W0311 bad-indentation +# W0401 wildcard-import +# W0603 global-statement +# W0613 unused-argument +# W0614 unused-wildcard-import View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/237abf742b30afd015ce3e063a0a307b10… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/237abf742b30afd015ce3e063a0a307b10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pass correct show state
by Philipp Hörist 03 Oct '18

03 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ef3cc504 by Philipp Hörist at 2018-10-03T05:53:30Z Pass correct show state - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -646,12 +646,12 @@ class Connection(CommonConnection, ConnectionHandlers): def set_oldst(self): # Set old state if self.old_show: self.connected = app.SHOW_LIST.index(self.old_show) - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show=self.connected)) + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show=app.SHOW_LIST[self.old_show])) else: # we default to online self.connected = 2 - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show=app.SHOW_LIST[self.connected])) + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show=app.SHOW_LIST[self.connected])) def disconnectedReconnCB(self): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef3cc504d236e1976fa556f57df1612303… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef3cc504d236e1976fa556f57df1612303… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix passing wrong type
by Philipp Hörist 01 Oct '18

01 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff424b50 by Philipp Hörist at 2018-10-01T19:25:10Z Fix passing wrong type - - - - - 1 changed file: - gajim/common/contacts.py Changes: ===================================== gajim/common/contacts.py ===================================== @@ -310,7 +310,7 @@ class LegacyContactsAPI: status=contact.status, sub=contact.sub, ask=contact.ask, resource=contact.resource, priority=contact.priority, keyID=contact.keyID, client_caps=contact.client_caps, - chatstate=contact.chatstate, + chatstate=contact.chatstate_enum, idle_time=contact.idle_time, avatar_sha=contact.avatar_sha) def add_contact(self, account, contact): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff424b50841744e20562b855290b2b48a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff424b50841744e20562b855290b2b48a0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix wrong argument
by Philipp Hörist 01 Oct '18

01 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4858bb46 by Philipp Hörist at 2018-10-01T05:50:48Z Fix wrong argument - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -2189,7 +2189,7 @@ class GroupchatControl(ChatControlBase): correct_id = None con = app.connections[self.account] chatstate = con.get_module('Chatstate').get_active_chatstate( - self.contact.jid) + self.contact) # Send the message app.nec.push_outgoing_event(GcMessageOutgoingEvent( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4858bb46f2d2754e294a10896b0a6deb14… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4858bb46f2d2754e294a10896b0a6deb14… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2018