Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] release: 1.4.0
by Philipp Hörist (＠lovetox) 12 May '22

12 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: efce7c40 by lovetox at 2022-05-12T20:38:06+02:00 release: 1.4.0 - - - - - 3 changed files: - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -75,6 +75,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.4.0" date="2022-05-11" /> <release version="1.3.3" date="2021-10-10" /> <release version="1.3.2" date="2021-04-24" /> <release version="1.3.1" date="2021-03-01" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -312,6 +312,6 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: gajim-1.3.3 + tag: gajim-1.4.0 post-install: - install -d /app/plugins ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = "1.4.0-dev1" +__version__ = '1.4.0' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/efce7c4016b1f86068f66b55fea90cc5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/efce7c4016b1f86068f66b55fea90cc5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update commit hook
by Philipp Hörist (＠lovetox) 12 May '22

12 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 41f09642 by lovetox at 2022-05-12T20:37:00+02:00 ci: Update commit hook - - - - - 1 changed file: - .githooks/update Changes: ===================================== .githooks/update ===================================== @@ -57,6 +57,7 @@ def enforce_message_rules(subject: str) -> None: if not subject[0].isdigit(): print('Release commits should be of the form "release: X.X.X"') sys.exit(1) + return if not subject[0].isupper(): print('First letter after tag must be uppercase') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41f096429757e816d5c053fb5d5ca3ce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41f096429757e816d5c053fb5d5ca3ce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update commit hook
by Philipp Hörist (＠lovetox) 11 May '22

11 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12bc071b by lovetox at 2022-05-11T22:48:17+02:00 ci: Update commit hook - - - - - 1 changed file: - .githooks/update Changes: ===================================== .githooks/update ===================================== @@ -53,6 +53,11 @@ def enforce_message_rules(subject: str) -> None: print('Unknown commit message tag:', tag) sys.exit(1) + if tag == 'release': + if not subject[0].isdigit(): + print('Release commits should be of the form "release: X.X.X"') + sys.exit(1) + if not subject[0].isupper(): print('First letter after tag must be uppercase') sys.exit(1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12bc071bfa54822f03ac512da3ffbf9e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12bc071bfa54822f03ac512da3ffbf9e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update CONTRIBUTING.md
by Philipp Hörist (＠lovetox) 11 May '22

11 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 243fdd5a by lovetox at 2022-05-11T21:30:26+02:00 chore: Update CONTRIBUTING.md - - - - - 1 changed file: - CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== @@ -40,6 +40,7 @@ # Commit Messages - perf (performance related changes) - refactor (code was changed, but the end user will not notice) - chore (reoccuring tasks which need to be done) +- release (only used for release commits) - other Further the first letter after the tag must be upper case View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/243fdd5a8c77c1f0420d789b8262b84e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/243fdd5a8c77c1f0420d789b8262b84e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Add allowed commit tag
by Philipp Hörist (＠lovetox) 11 May '22

11 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3df84466 by lovetox at 2022-05-11T21:27:12+02:00 ci: Add allowed commit tag - - - - - 1 changed file: - .githooks/update Changes: ===================================== .githooks/update ===================================== @@ -9,7 +9,17 @@ import sys import subprocess -ALLOWED_TAGS = ['ci', 'feat', 'fix', 'perf', 'refactor', 'chore', 'other'] +ALLOWED_TAGS = [ + 'ci', + 'feat', + 'fix', + 'perf', + 'refactor', + 'chore', + 'release', + 'other', +] + def parse_args() -> Tuple[str, str]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3df84466e5d0b62717073667b9da32d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3df84466e5d0b62717073667b9da32d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Update ChangeLog
by Philipp Hörist (＠lovetox) 11 May '22

11 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f12d0788 by lovetox at 2022-05-11T21:12:52+02:00 chore: Update ChangeLog - - - - - bc7861fc by Weblate at 2022-05-11T21:12:52+02:00 chore: Update translations - - - - - 23 changed files: - ChangeLog - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gajim.pot - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ace18ddca102ab532f7f38412fe6b20… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ace18ddca102ab532f7f38412fe6b20… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: Remove redundant wheel dependency
by Philipp Hörist (＠lovetox) 10 May '22

10 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bb03e94e by lovetox at 2022-05-10T22:58:43+02:00 fix: Remove redundant wheel dependency Fixes #126 - - - - - 1 changed file: - pyproject.toml Changes: ===================================== pyproject.toml ===================================== @@ -1,6 +1,5 @@ [build-system] requires = [ "setuptools >= 43.0.0", - "wheel", ] build-backend = "setuptools.build_meta" View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bb03e94ef637caa9cf317dd2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bb03e94ef637caa9cf317dd2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Settings: Define encoding when calling open()
by Philipp Hörist (＠lovetox) 10 May '22

10 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ace18ddc by lovetox at 2022-05-10T22:34:11+02:00 fix: Settings: Define encoding when calling open() - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -225,7 +225,7 @@ def _load_app_overrides(self) -> None: if not OVERRIDES_PATH.exists(): return - with OVERRIDES_PATH.open() as f: + with OVERRIDES_PATH.open(encoding='utf8') as f: try: self._app_overrides = json.load(f) except Exception: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ace18ddca102ab532f7f38412fe6b202… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ace18ddca102ab532f7f38412fe6b202… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: feat: Plugins: Set error if init fails
by Philipp Hörist (＠lovetox) 10 May '22

10 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94842c27 by lovetox at 2022-05-10T21:12:50+02:00 feat: Plugins: Set error if init fails - - - - - aa4d0354 by lovetox at 2022-05-10T21:54:13+02:00 feat: Allow users to override settings - - - - - 195ec814 by lovetox at 2022-05-10T22:05:07+02:00 feat: Plugins: Allow users to disable plugin repository - - - - - a496dbbb by lovetox at 2022-05-10T22:25:03+02:00 feat: Settings: Show lock icon if setting has an override - - - - - 5 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/settings.py - gajim/plugins/pluginmanager.py - gajim/plugins/repository.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -105,6 +105,7 @@ class _ACCOUNT_DEFAULT: 'use_stun_server', 'use_urgency_hint', 'video_see_self', + 'plugins_repository_enabled', 'plugins_update_check', 'plugins_auto_update', 'plugins_notify_after_update', @@ -297,6 +298,7 @@ class _ACCOUNT_DEFAULT: 'preview_leftclick_action': 'open', 'preview_verify_https': True, 'preview_anonymous_muc': False, + 'plugins_repository_enabled': True, 'plugins_update_check': True, 'plugins_auto_update': False, 'plugins_notify_after_update': True, ===================================== gajim/common/settings.py ===================================== @@ -106,6 +106,8 @@ _CallbackDict = dict[tuple[str, Optional[str], Optional[JID]], list[weakref.WeakMethod[_SignalCallable]]] +OVERRIDES_PATH = Path('/etc/gajim/app-overrides.json') + class Settings: def __init__(self): @@ -113,6 +115,7 @@ def __init__(self): self._commit_scheduled = None self._settings = {} + self._app_overrides: dict[str, AllSettingsT] = {} self._account_settings = {} self._callbacks: _CallbackDict = defaultdict(list) @@ -206,6 +209,7 @@ def init(self) -> None: self._migrate_old_config() self._commit() self._migrate_database() + self._load_app_overrides() @staticmethod def _setup_installation_defaults() -> None: @@ -217,6 +221,19 @@ def _setup_installation_defaults() -> None: # Windows and MacOS APP_SETTINGS['dev_use_message_label'] = False + def _load_app_overrides(self) -> None: + if not OVERRIDES_PATH.exists(): + return + + with OVERRIDES_PATH.open() as f: + try: + self._app_overrides = json.load(f) + except Exception: + log.exception('Failed to load overrides') + return + + self._settings['app'].update(self._app_overrides) + @staticmethod def _namedtuple_factory(cursor: sqlite3.Cursor, row: tuple[Any, ...]) -> NamedTuple: @@ -517,6 +534,9 @@ def _commit_settings(self, name: str, schedule: bool = True) -> None: self._commit(schedule=schedule) + def has_app_override(self, setting: str) -> bool: + return setting in self._app_overrides + @overload def get_app_setting(self, setting: BoolSettings) -> bool: ... @overload @@ -544,6 +564,11 @@ def set_app_setting(self, setting: str, value: Optional[AllSettingsT]) -> None: if setting not in APP_SETTINGS: raise ValueError(f'Invalid app setting: {setting}') + if setting in self._app_overrides: + log.warning('Changing %s is not allowed because there exists an ' + 'override', setting) + return + default = APP_SETTINGS[setting] if not isinstance(value, type(default)) and value is not None: raise TypeError(f'Invalid type for {setting}: ' ===================================== gajim/gtk/settings.py ===================================== @@ -204,6 +204,16 @@ def __init__(self, self.enabled_func = enabled_func self.setting_value = self.get_value() + self._locked_icon = Gtk.Image.new_from_icon_name( + 'feather-lock-symbolic', + Gtk.IconSize.MENU) + self._locked_icon.set_visible(False) + self._locked_icon.set_no_show_all(True) + self._locked_icon.set_halign(Gtk.Align.END) + self._locked_icon.set_tooltip_text(_('Setting is locked by the system')) + + self._grid.add(self._locked_icon) + description_box = Gtk.Box( orientation=Gtk.Orientation.VERTICAL, spacing=0) description_box.set_valign(Gtk.Align.CENTER) @@ -372,6 +382,13 @@ def on_row_activated(self) -> None: raise NotImplementedError def update_activatable(self) -> None: + if self.type_ == SettingType.CONFIG: + if app.settings.has_app_override(self.value): + self.set_activatable(False) + self.set_sensitive(False) + self._locked_icon.show() + return + if self.enabled_func is None: return ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -284,8 +284,9 @@ def init_plugins(self) -> None: try: self.activate_plugin(plugin) - except GajimPluginActivateException: - pass + except GajimPluginActivateException as error: + plugin.activatable = False + plugin.available_text = str(error) def _load_plugin_module(self, manifest: PluginManifest ===================================== gajim/plugins/repository.py ===================================== @@ -59,8 +59,9 @@ def __init__(self) -> None: self._download_queue: set[PluginManifest] = set() - make_http_request('https://gajim.org/updates.json', - self._on_repository_received) + if app.settings.get('plugins_repository_enabled'): + make_http_request('https://gajim.org/updates.json', + self._on_repository_received) @property def available(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3dd59364b924b58f5a4c077ebe5199b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3dd59364b924b58f5a4c077ebe5199b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Enable 32bit build
by Philipp Hörist (＠lovetox) 10 May '22

10 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3dd59364 by lovetox at 2022-05-10T20:46:26+02:00 ci: Windows: Enable 32bit build - - - - - 1 changed file: - .ci/appveyor.yml Changes: ===================================== .ci/appveyor.yml ===================================== @@ -3,14 +3,14 @@ version: 1.1.{build} image: Visual Studio 2019 environment: - # matrix: - MSYSTEM: MINGW64 - MSYS_ARCH: "x86_64" - ARCH: "64bit" - - # - MSYSTEM: MINGW32 - # MSYS_ARCH: "i686" - # ARCH: "32bit" + matrix: + - MSYSTEM: MINGW64 + MSYS_ARCH: "x86_64" + ARCH: "64bit" + + - MSYSTEM: MINGW32 + MSYS_ARCH: "i686" + ARCH: "32bit" branches: only: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3dd59364b924b58f5a4c077ebe5199bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3dd59364b924b58f5a4c077ebe5199bd… 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