Commits December 2020

commits@gajim.org

1 participants
56 discussions

[Git][gajim/gajim] Deleted tag gajim-1.3.0-beta1
by Philipp Hörist 31 Dec '20

31 Dec '20

Philipp Hörist deleted tag gajim-1.3.0-beta1 at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.3.0-beta1
by Philipp Hörist 31 Dec '20

31 Dec '20

Philipp Hörist pushed new tag gajim-1.3.0-beta1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/gajim-1.3.0-beta1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Windows: Convert version correctly
by Philipp Hörist 30 Dec '20

30 Dec '20

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 55907395 by lovetox at 2020-12-30T23:40:21+01:00 Windows: Convert version correctly - - - - - 1 changed file: - win/misc/create-launcher.py Changes: ===================================== win/misc/create-launcher.py ===================================== @@ -136,7 +136,7 @@ def get_resouce_code(filename, file_version, file_desc, icon_path, """ def to_ver_list(v): - v = v.replace('-dev', '.') + v = v.split("-")[0] return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) file_version_list = to_ver_list(file_version) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55907395d46d5d5e41e16f762c12461a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55907395d46d5d5e41e16f762c12461a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Convert version correctly
by Philipp Hörist 30 Dec '20

30 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a838b653 by lovetox at 2020-12-30T23:39:29+01:00 Windows: Convert version correctly - - - - - 1 changed file: - win/misc/create-launcher.py Changes: ===================================== win/misc/create-launcher.py ===================================== @@ -136,7 +136,7 @@ def get_resouce_code(filename, file_version, file_desc, icon_path, """ def to_ver_list(v): - v = v.replace('-dev', '.') + v = v.split("-")[0] return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) file_version_list = to_ver_list(file_version) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a838b6532d64bf3d5f46c05a61bbd718… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a838b6532d64bf3d5f46c05a61bbd718… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix build
by Philipp Hörist 30 Dec '20

30 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a379e8dc by lovetox at 2020-12-30T22:42:30+01:00 Windows: Fix build - - - - - 2 changed files: - appveyor.yml - win/misc/create-launcher.py Changes: ===================================== appveyor.yml ===================================== @@ -1,3 +1,5 @@ +image: Visual Studio 2019 + environment: matrix: - MSYSTEM: MINGW64 @@ -19,11 +21,6 @@ clone_depth: 1 install: - set PATH=C:\msys64\usr\bin;%PATH% - # Download new keyring until appveyor updates its installation - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.x…" - - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" - - bash -lc "pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz --noconfirm" - bash -lc "pacman --needed --noconfirm -Syu" # This is needed because without killing all processes -Su will fail - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process ===================================== win/misc/create-launcher.py ===================================== @@ -136,6 +136,7 @@ def get_resouce_code(filename, file_version, file_desc, icon_path, """ def to_ver_list(v): + v = v.replace('-dev', '.') return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) file_version_list = to_ver_list(file_version) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a379e8dcdf2068586bcfe809b7d712cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a379e8dcdf2068586bcfe809b7d712cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Windows: Fix build
by Philipp Hörist 30 Dec '20

30 Dec '20

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: c67da7dd by lovetox at 2020-12-30T22:42:58+01:00 Windows: Fix build - - - - - 2 changed files: - appveyor.yml - win/misc/create-launcher.py Changes: ===================================== appveyor.yml ===================================== @@ -1,3 +1,5 @@ +image: Visual Studio 2019 + environment: matrix: - MSYSTEM: MINGW64 @@ -19,11 +21,6 @@ clone_depth: 1 install: - set PATH=C:\msys64\usr\bin;%PATH% - # Download new keyring until appveyor updates its installation - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.x…" - - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" - - bash -lc "pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz --noconfirm" - bash -lc "pacman --needed --noconfirm -Syu" # This is needed because without killing all processes -Su will fail - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process ===================================== win/misc/create-launcher.py ===================================== @@ -136,6 +136,7 @@ def get_resouce_code(filename, file_version, file_desc, icon_path, """ def to_ver_list(v): + v = v.replace('-dev', '.') return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) file_version_list = to_ver_list(file_version) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c67da7dd5f9ca27db862dca36dfbdb00… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c67da7dd5f9ca27db862dca36dfbdb00… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Windows: Use correct nbxmpp branch for build
by Philipp Hörist 30 Dec '20

30 Dec '20

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 4c126259 by lovetox at 2020-12-30T12:36:54+01:00 Windows: Use correct nbxmpp branch for build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -94,7 +94,7 @@ function install_deps { build_pip install precis-i18n PIP_REQUIREMENTS="\ -git+https://dev.gajim.org/gajim/python-nbxmpp.git +git+https://dev.gajim.org/gajim/python-nbxmpp.git@nbxmpp_2.0 git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://github.com/enthought/pywin32-ctypes.git keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4c12625965e47f10ccfac0fa3bfd9622… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4c12625965e47f10ccfac0fa3bfd9622… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] Windows: Use correct nbxmpp branch for build
by Philipp Hörist 30 Dec '20

30 Dec '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: d3465a76 by lovetox at 2020-12-30T12:35:51+01:00 Windows: Use correct nbxmpp branch for build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -100,7 +100,7 @@ function install_deps { build_pip install precis-i18n PIP_REQUIREMENTS="\ -git+https://dev.gajim.org/gajim/python-nbxmpp.git +git+https://dev.gajim.org/gajim/python-nbxmpp.git@nbxmpp_1.0 git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://github.com/enthought/pywin32-ctypes.git keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3465a76befc07981cdd59abe6c9a440… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3465a76befc07981cdd59abe6c9a440… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Don’t send PM if group chat is not anonymous
by Philipp Hörist 29 Dec '20

29 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c0980b92 by Daniel Brötzmann at 2020-12-29T23:19:26+01:00 Don’t send PM if group chat is not anonymous - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/groupchat_control.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -116,6 +116,7 @@ class _ACCOUNT_DEFAULT: 'notification_position_x': -1, 'notification_position_y': -1, 'muc_highlight_words': '', + 'muc_prefer_direct_msg': True, 'quit_on_roster_x_button': False, 'hide_on_roster_x_button': False, 'show_status_msgs_in_roster': True, ===================================== gajim/groupchat_control.py ===================================== @@ -1902,11 +1902,14 @@ def _start_private_message(self, nick): gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) nick_jid = gc_c.get_full_jid() - ctrl = app.interface.msg_win_mgr.get_control(nick_jid, self.account) - if not ctrl: + muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') + pm_queue = len(app.events.get_events( + self.account, jid=nick_jid, types=['pm'])) + if not self.is_anonymous and muc_prefer_direct_msg and not pm_queue: + jid = app.get_jid_without_resource(gc_c.jid) + ctrl = app.interface.new_chat_from_jid(self.account, jid) + else: ctrl = app.interface.new_private_chat(gc_c, self.account) - - if ctrl: ctrl.parent_win.set_active_tab(ctrl) return ctrl ===================================== gajim/gtk/preferences.py ===================================== @@ -420,6 +420,12 @@ def __init__(self, *args): desc=_('Default for new public group chats'), props={'entries': THRESHOLD_OPTIONS}), + Setting(SettingKind.SWITCH, + _('Direct Messages'), + SettingType.CONFIG, + 'muc_prefer_direct_msg', + desc=_('Prefer direct messages in private group chats ')), + Setting(SettingKind.SWITCH, _('Show Joined / Left'), SettingType.CONFIG, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0980b922f2cb16a5513d8e719f0f003… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0980b922f2cb16a5513d8e719f0f003… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify imports
by Philipp Hörist 29 Dec '20

29 Dec '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 39bdea7b by lovetox at 2020-12-29T23:08:32+01:00 Simplify imports - - - - - 1 changed file: - gajim/gui/__init__.py Changes: ===================================== gajim/gui/__init__.py ===================================== @@ -1,10 +1,11 @@ import sys -import importlib +from importlib.abc import MetaPathFinder +from importlib.util import spec_from_file_location from pathlib import Path -class GUIFinder(importlib.abc.MetaPathFinder): +class GUIFinder(MetaPathFinder): def __init__(self, name, fallback=None): self._path = Path(__file__).parent.parent / name @@ -22,7 +23,7 @@ def find_spec(self, fullname, _path, _target=None): if module_path is None: return None - spec = importlib.util.spec_from_file_location(fullname, module_path) + spec = spec_from_file_location(fullname, module_path) return spec View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/39bdea7b4e09812f62a6b746b697509c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/39bdea7b4e09812f62a6b746b697509c… 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 December 2020