Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Dont use str as a var name
by Philipp Hörist 09 Apr '18

09 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 363fdf7d by Philipp Hörist at 2018-04-09T21:39:57+02:00 Dont use str as a var name - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -502,9 +502,9 @@ class ChatControl(ChatControlBase): if jingle_type not in ('audio', 'video'): return if state in ('connecting', 'connected', 'stop', 'error') and reason: - str = _('%(type)s state : %(state)s, reason: %(reason)s') % { + info = _('%(type)s state : %(state)s, reason: %(reason)s') % { 'type': jingle_type.capitalize(), 'state': state, 'reason': reason} - self.print_conversation(str, 'info') + self.print_conversation(info, 'info') states = {'connecting': self.JINGLE_STATE_CONNECTING, 'connection_received': self.JINGLE_STATE_CONNECTION_RECEIVED, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/363fdf7d9a71360d54a8b1255005d3f132… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/363fdf7d9a71360d54a8b1255005d3f132… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Delete account from config if registration fails
by Philipp Hörist 09 Apr '18

09 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cf8f0c2e by Philipp Hörist at 2018-04-09T19:14:42+02:00 Delete account from config if registration fails - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2370,6 +2370,8 @@ class AccountCreationWizardWindow: elif cur_page == 4: if self.account in app.connections: del app.connections[self.account] + if self.account in app.config.get_per('accounts'): + app.config.del_per('accounts', self.account) self.notebook.set_current_page(2) self.xml.get_object('form_vbox').remove(self.data_form_widget) elif cur_page == 6: # finish page View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf8f0c2e83da8d137d7c6e548bfcc25659… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf8f0c2e83da8d137d7c6e548bfcc25659… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make code better understandable
by Philipp Hörist 08 Apr '18

08 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6baed38d by Philipp Hörist at 2018-04-09T00:35:27+02:00 Make code better understandable - - - - - 1 changed file: - gajim/options_dialog.py Changes: ===================================== gajim/options_dialog.py ===================================== --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -210,11 +210,11 @@ class GenericOption(Gtk.Grid): self.set_property('option-value', state) @staticmethod - def set_no_log_for(account, jid): + def set_no_log_for(account, state): no_log = app.config.get_per('accounts', account, 'no_log_for').split() - if jid and account in no_log: + if state and account in no_log: no_log.remove(account) - elif not jid and account not in no_log: + elif not state and account not in no_log: no_log.append(account) app.config.set_per('accounts', account, 'no_log_for', ' '.join(no_log)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6baed38d4ce7005c2f82b1ff2cb32141d7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6baed38d4ce7005c2f82b1ff2cb32141d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: save encoded avatar when receiving vCard from server
by Philipp Hörist 08 Apr '18

08 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36b31259 by Bronko at 2018-04-08T20:58:24+02:00 save encoded avatar when receiving vCard from server - - - - - fcad0f08 by Bronko at 2018-04-08T23:45:32+02:00 save hash and mime_type of avatar when receiving vCard from server in case the avatar is not changed by the user we must resend the still valid hash. if we do not save the hash here, gajim advertises an empty photo element after publishing the vCard, which removes the avatar for all receiving clients of the photo element update - - - - - 1 changed file: - gajim/profile_window.py Changes: ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -29,6 +29,7 @@ from gi.repository import GdkPixbuf import base64 import time import logging +import hashlib from gajim import gtkgui_helpers from gajim import dialogs @@ -227,7 +228,11 @@ class ProfileWindow: photo_encoded = vcard_[i]['BINVAL'] if photo_encoded == '': continue + self.avatar_encoded = photo_encoded photo_decoded = base64.b64decode(photo_encoded.encode('utf-8')) + self.avatar_sha = hashlib.sha1(photo_decoded).hexdigest() + if 'TYPE' in vcard_[i]: + self.avatar_mime_type = vcard_[i]['TYPE'] pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded) if pixbuf is None: continue View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/879e03449cb362d16eeeefc16a9537f5c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/879e03449cb362d16eeeefc16a9537f5c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix Gitlab CI
by Yann Leboulanger 08 Apr '18

08 Apr '18

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 56848a8e by Yann Leboulanger at 2018-04-08T14:26:46+02:00 fix Gitlab CI - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - sudo apt-get update -qq && sudo apt-get build-dep -y -qq python-nbxmpp-nightly + - sudo apt-get update -qq && sudo apt-get build-dep -y -qq python3-nbxmpp-nightly stages: - test @@ -15,7 +15,7 @@ run-build: script: - rm -rf dist - export FN="nbxmpp-"$(date +%F) - - python setup.py sdist + - python3 setup.py sdist - scp dist/nbxmpp-*.tar.gz panoramix:/var/www/gajim/downloads/snap/ci/$FN-$CI_COMMIT_SHA.tar.gz artifacts: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/56848a8e0ab6fd13a2d73f22c3… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/56848a8e0ab6fd13a2d73f22c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Improve coding style. Fixes gajim/gajim#8366
by Yann Leboulanger 08 Apr '18

08 Apr '18

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: ece9faec by Yann Leboulanger at 2018-04-08T14:16:51+02:00 Improve coding style. Fixes gajim/gajim#8366 - - - - - 1 changed file: - nbxmpp/features_nb.py Changes: ===================================== nbxmpp/features_nb.py ===================================== --- a/nbxmpp/features_nb.py +++ b/nbxmpp/features_nb.py @@ -132,14 +132,14 @@ def getPrivacyLists(disp): def _on_response(resp): dict_ = {'lists': []} if not isResultNode(resp): - disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, (False)) + disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, False) return for list_ in resp.getQueryPayload(): if list_.getName()=='list': dict_['lists'].append(list_.getAttr('name')) else: dict_[list_.getName()]=list_.getAttr('name') - disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, (dict_)) + disp.Event(NS_PRIVACY, PRIVACY_LISTS_RECEIVED, dict_) disp.SendAndCallForResponse(iq, _on_response) def getActiveAndDefaultPrivacyLists(disp): @@ -147,14 +147,14 @@ def getActiveAndDefaultPrivacyLists(disp): def _on_response(resp): dict_ = {'active': '', 'default': ''} if not isResultNode(resp): - disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, (False)) + disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, False) return for list_ in resp.getQueryPayload(): if list_.getName() == 'active': dict_['active'] = list_.getAttr('name') elif list_.getName() == 'default': dict_['default'] = list_.getAttr('name') - disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, (dict_)) + disp.Event(NS_PRIVACY, PRIVACY_LISTS_ACTIVE_DEFAULT, dict_) disp.SendAndCallForResponse(iq, _on_response) def getPrivacyList(disp, listname): @@ -164,9 +164,9 @@ def getPrivacyList(disp, listname): """ def _on_response(resp): if not isResultNode(resp): - disp.Event(NS_PRIVACY, PRIVACY_LIST_RECEIVED, (False)) + disp.Event(NS_PRIVACY, PRIVACY_LIST_RECEIVED, False) return - disp.Event(NS_PRIVACY, PRIVACY_LIST_RECEIVED, (resp)) + disp.Event(NS_PRIVACY, PRIVACY_LIST_RECEIVED, resp) iq = Iq('get', NS_PRIVACY, payload=[Node('list', {'name': listname})]) disp.SendAndCallForResponse(iq, _on_response) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ece9faec6857562c85b671f621… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ece9faec6857562c85b671f621… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: update action when creating groupchat window. Fixes #9042
by Yann Leboulanger 07 Apr '18

07 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6d868546 by Yann Leboulanger at 2018-04-07T22:48:38+02:00 update action when creating groupchat window. Fixes #9042 - - - - - 879e0344 by Yann Leboulanger at 2018-04-07T23:06:48+02:00 fix some py2->py3 missing things. Fixes #9019 - - - - - 5 changed files: - gajim/common/file_props.py - gajim/common/rst_xhtml_generator.py - gajim/groupchat_control.py - − scripts/dev/run-build-test.py - scripts/dev/run-pylint.py Changes: ===================================== gajim/common/file_props.py ===================================== --- a/gajim/common/file_props.py +++ b/gajim/common/file_props.py @@ -3,13 +3,13 @@ This module is in charge of taking care of all the infomation related to individual files. Files are identified by the account name and its sid. ->>> print FilesProp.getFileProp('jabberid', '10') +>>> print(FilesProp.getFileProp('jabberid', '10')) None >>> fp = FilesProp() Traceback (most recent call last): ... Exception: this class should not be instatiated ->>> print FilesProp.getAllFileProp() +>>> print(FilesProp.getAllFileProp()) [] >>> fp = FilesProp.getNewFileProp('jabberid', '10') >>> fp2 = FilesProp.getFileProp('jabberid', '10') ===================================== gajim/common/rst_xhtml_generator.py ===================================== --- a/gajim/common/rst_xhtml_generator.py +++ b/gajim/common/rst_xhtml_generator.py @@ -153,7 +153,7 @@ if __name__ == '__main__': print("test 1\n" + Generator.create_xhtml(""" test:: ->>> print 1 +>>> print(1) 1 *I* like it. It is for :JEP:`71` ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -335,6 +335,7 @@ class GroupchatControl(ChatControlBase): # Tooltip Window and Actions have to be created with parent self.set_tooltip() self.add_actions() + GLib.idle_add(self.update_actions) self.scale_factor = parent_win.window.get_scale_factor() self._connect_window_state_change(parent_win) else: ===================================== scripts/dev/run-build-test.py deleted ===================================== --- a/scripts/dev/run-build-test.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - -import os -import sys - -if os.getcwd().endswith('dev'): - os.chdir('../../') # we were in scripts/dev - -ret = 0 -ret += os.system("make clean > " + os.devnull) -ret += os.system("make > " + os.devnull) -ret += os.system("make check > " + os.devnull) - -if ret == 0: - print "Build successfull" - sys.exit(0) -else: - print >>sys.stderr, "Build failed" - sys.exit(1) ===================================== scripts/dev/run-pylint.py ===================================== --- a/scripts/dev/run-pylint.py +++ b/scripts/dev/run-pylint.py @@ -1,5 +1,6 @@ -#!/usr/bin/env python -# (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +#!/usr/bin/env python3 +# Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +# Copyright (C) 2016 Yann Leboulanger <asterix AT lagaule.org> import os import sys @@ -7,4 +8,4 @@ import sys if os.getcwd().endswith('dev'): os.chdir('../../gajim/') # we were in scripts/dev -os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:])) +os.system("pylint3 --generated-members= --additional-builtins='_' --disable=C0103,C0111,W0703,W0511,W0142,W0613,R0201,design " + "".join(sys.argv[1:])) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/27e45856b030f29e0ccf7c55e9923d4cc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/27e45856b030f29e0ccf7c55e9923d4cc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] prevent traceback. Fixes #9054
by Yann Leboulanger 07 Apr '18

07 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 27e45856 by Yann Leboulanger at 2018-04-07T22:04:32+02:00 prevent traceback. Fixes #9054 - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -319,7 +319,7 @@ class SocksQueue: self.process_result(result, sender) def send_file(self, file_props, account, mode): - for key in self.senders.keys(): + for key in list(self.senders.keys()): if file_props.name in key and file_props.transport_sid in key \ and self.senders[key].mode == mode: log.info('socks5: sending file') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27e45856b030f29e0ccf7c55e9923d4cc9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27e45856b030f29e0ccf7c55e9923d4cc9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] prevent a traceback with wrong bookmarks. Fixes #9055
by Yann Leboulanger 07 Apr '18

07 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 93b50bf1 by Yann Leboulanger at 2018-04-07T22:01:39+02:00 prevent a traceback with wrong bookmarks. Fixes #9055 - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2119,7 +2119,12 @@ class ManageBookmarksWindow: # Fill in the data for childs self.title_entry.set_text(model[iter_][1]) room_jid = model[iter_][2] - (room, server) = room_jid.split('@') + room_jid_s = room_jid.split('@') + if len(room_jid_s) == 1: + room = '' + server = room_jid + else: + (room, server) = room_jid_s self.room_entry.handler_block(self.room_entry_changed_id) self.room_entry.set_text(room) self.room_entry.handler_unblock(self.room_entry_changed_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/93b50bf1f66359c7b32ca046ed5d769d9f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/93b50bf1f66359c7b32ca046ed5d769d9f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix regression from 4caa4971
by Philipp Hörist 05 Apr '18

05 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cf911b39 by Philipp Hörist at 2018-04-05T22:14:57+02:00 Fix regression from 4caa4971 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2695,6 +2695,8 @@ class RosterWindow: self.draw_account(obj.conn.name) def _nec_decrypted_message_received(self, obj): + if not obj.msgtxt: + return True if obj.mtype not in ('normal', 'chat'): return if obj.mtype == 'normal' and obj.popup: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf911b3984ad3227c09a5a007f491c5447… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf911b3984ad3227c09a5a007f491c5447… You're receiving this email because of your account on dev.gajim.org.

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