Commits April 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] fix: Notifications: Convert avatar correctly
by Philipp Hörist (＠lovetox) 04 Apr '22

04 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c9dc7133 by lovetox at 2022-04-04T18:06:17+02:00 fix: Notifications: Convert avatar correctly Fixes #10813 - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -372,11 +372,13 @@ def _make_notification_id(self, def _get_avatar_for_notification(account: str, jid: Union[JID, str]) -> GdkPixbuf.Pixbuf: scale = get_monitor_scale_factor() + size = AvatarSize.NOTIFICATION client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - return contact.get_avatar(AvatarSize.NOTIFICATION, - scale, - pixbuf=True) + avatar_surface = contact.get_avatar(size, scale) + pixbuf = Gdk.pixbuf_get_from_surface(avatar_surface, 0, 0, size, size) + assert pixbuf is not None + return pixbuf def _make_icon(self, event: events.Notification) -> Gio.Icon: if (event.type == 'incoming-message' and app.desktop_env == 'gnome'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c9dc71334b29277fc59f568ffd27ad9f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c9dc71334b29277fc59f568ffd27ad9f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Themes: Check for correct type
by Philipp Hörist (＠lovetox) 04 Apr '22

04 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8c49983c by lovetox at 2022-04-04T17:47:05+02:00 fix: Themes: Check for correct type Fixes #10814 - - - - - 1 changed file: - gajim/gtk/themes.py Changes: ===================================== gajim/gtk/themes.py ===================================== @@ -326,7 +326,7 @@ def _remove_theme(): app.css_config.remove_theme(theme) self._update_preferences_window() - assert isinstance(store, Gtk.TreeStore) + assert isinstance(store, Gtk.ListStore) assert iter_ is not None store.remove(iter_) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8c49983c997b89a54ca122f4a659097b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8c49983c997b89a54ca122f4a659097b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translation files
by Philipp Hörist (＠lovetox) 03 Apr '22

03 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8ab24066 by lovetox at 2022-04-03T23:34:43+02:00 chore: Update translation files - - - - - 1 changed file: - po/LINGUAS Changes: ===================================== po/LINGUAS ===================================== @@ -3,6 +3,7 @@ be be@latin bg br +ca cs da de View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8ab24066240c4e06c49ad33cb86bea76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8ab24066240c4e06c49ad33cb86bea76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: ExceptionDialog: Hide Infobar by default
by Philipp Hörist (＠lovetox) 03 Apr '22

03 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 273e6d7c by lovetox at 2022-04-03T14:43:21+02:00 fix: ExceptionDialog: Hide Infobar by default - - - - - 18735310 by lovetox at 2022-04-03T20:22:20+02:00 fix: ExceptionDialog: Improve sentry configuration - Reduce data sent to whats absolutely necessary - - - - - 2 changed files: - gajim/data/gui/exception_dialog.ui - gajim/gtk/exception.py Changes: ===================================== gajim/data/gui/exception_dialog.ui ===================================== @@ -10,6 +10,7 @@ <object class="GtkInfoBar" id="infobar"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="revealed">False</property> <child internal-child="action_area"> <object class="GtkButtonBox"> <property name="can-focus">False</property> ===================================== gajim/gtk/exception.py ===================================== @@ -17,6 +17,9 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any from typing import Type from types import TracebackType @@ -25,6 +28,7 @@ import traceback import threading import webbrowser +import pprint from io import StringIO from urllib.parse import urlencode @@ -221,12 +225,16 @@ def _init_sentry(self, endpoint: str) -> None: dsn=endpoint, traces_sample_rate=0.0, max_breadcrumbs=0, - release=gajim.__version__) + release=gajim.__version__, + default_integrations=False, + shutdown_timeout=0, + auto_session_tracking=False, + before_send=self._before_send) + sentry_sdk.set_context('os', { 'name': get_os_name(), 'version': get_os_version()}) - sentry_sdk.set_context('app', { - 'app_version': gajim.__version__}) + sentry_sdk.set_context('software', { 'python-nbxmpp': nbxmpp.__version__, 'GTK': get_gtk_version(), @@ -234,10 +242,16 @@ def _init_sentry(self, endpoint: str) -> None: 'GLib': get_glib_version()}) def _capture_exception(self) -> None: - sentry_sdk.set_context('user feedback', { + sentry_sdk.set_context('user_feedback', { 'Feedback': self._ui.user_feedback_entry.get_text()}) sentry_sdk.capture_exception(self._traceback_data) + def _before_send(self, event: dict[str, Any], hint: Any) -> dict[str, Any]: + # Remove the hostname of the machine + event['server_name'] = '' + pprint.pprint(event) + return event + def init() -> None: if sys.platform == 'win32' or not sys.stderr.isatty(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ac718d0b33ef82ddac8119338d6984d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ac718d0b33ef82ddac8119338d6984d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: ci: Add deploy script
by Philipp Hörist (＠lovetox) 03 Apr '22

03 Apr '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: abaf749a by lovetox at 2022-04-03T16:17:06+02:00 ci: Add deploy script - - - - - 2df995db by lovetox at 2022-04-03T16:17:19+02:00 ci: Add deploy stage - - - - - 2 changed files: - + .ci/deploy.py - .gitlab-ci.yml Changes: ===================================== .ci/deploy.py ===================================== @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 + +import os +import sys +import subprocess +from pathlib import Path + + +REPO_DIR = Path(__file__).parent.parent +USERNAME = '__token__' +PASSWORD = os.environ['PYPI_TOKEN'] + + +def build() -> None: + cmd = [ + 'python', + 'setup.py', + 'sdist', + 'bdist_wheel' + ] + + try: + subprocess.run(cmd, cwd=REPO_DIR, check=True) + except subprocess.CalledProcessError: + sys.exit('buid failed') + + +def upload() -> None: + cmd = [ + 'twine', + 'upload', + '--username', USERNAME, + '--password', PASSWORD, + 'dist/*' + ] + + try: + subprocess.run(cmd, cwd=REPO_DIR, check=True) + except subprocess.CalledProcessError: + sys.exit('upload failed') + + +if __name__ == '__main__': + build() + upload() ===================================== .gitlab-ci.yml ===================================== @@ -3,6 +3,7 @@ image: ci-gajim:master stages: - test - build + - deploy run-test: stage: test @@ -26,3 +27,11 @@ run-build: expire_in: 1 week paths: - dist/nbxmpp-*.tar.gz + +deploy-pypi: + stage: deploy + rules: + - if: '$CI_COMMIT_TAG' + when: manual + script: + - python3 .ci/deploy.py View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e80c9325a77ff2f03b86367… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e80c9325a77ff2f03b86367… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Inform users about gajim-remote being deprecated
by Philipp Hörist (＠lovetox) 03 Apr '22

03 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ac718d0b by André Apitzsch at 2022-04-03T10:26:00+02:00 chore: Inform users about gajim-remote being deprecated Part of #8609. - - - - - 1 changed file: - gajim/gajim_remote.py Changes: ===================================== gajim/gajim_remote.py ===================================== @@ -28,6 +28,7 @@ import sys import locale import signal +import warnings from gajim.common import exceptions from gajim.common.i18n import _ @@ -55,6 +56,16 @@ def send_error(error_message): print(_('D-Bus is not present on this machine or python module is missing')) sys.exit(1) +if not sys.warnoptions: + warnings.simplefilter("default") + +warnings.warn( + "gajim-remote is deprecated, use Gajim's DBus interface instead. " + "For further information see " + "https://dev.gajim.org/gajim/gajim/-/wikis/help/GajimDBus.", + DeprecationWarning +) + OBJ_PATH = '/org/gajim/dbus/RemoteObject' INTERFACE = 'org.gajim.dbus.RemoteInterface' SERVICE = 'org.gajim.Gajim' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ac718d0b33ef82ddac8119338d6984d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ac718d0b33ef82ddac8119338d6984d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Add missing env variable
by Philipp Hörist (＠lovetox) 03 Apr '22

03 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 277b4585 by lovetox at 2022-04-03T08:36:15+02:00 ci: Add missing env variable - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -74,6 +74,8 @@ build-and-deploy-windows: rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' + variables: + DEPLOY_TYPE: "windows" script: - python3 .ci/appveyor_build.py - python3 .ci/deploy.py build View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/277b4585b741400be256166d700c798d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/277b4585b741400be256166d700c798d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remove trailing newline
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e9560cf9 by lovetox at 2022-04-02T20:29:45+02:00 fix: Remove trailing newline - - - - - 1 changed file: - gajim/common/dbus/music_track.py Changes: ===================================== gajim/common/dbus/music_track.py ===================================== @@ -212,4 +212,3 @@ def proxy_call_finished(proxy, res): -1, None, proxy_call_finished) - View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9560cf9f09a3fe0025a35768a39f1cd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9560cf9f09a3fe0025a35768a39f1cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Start music track listener only if necessary
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6b51f1a3 by André Apitzsch at 2022-04-02T20:15:47+02:00 other: Start music track listener only if necessary Only start music track listener if publishing media playback is enabled for at least one account. - - - - - 4 changed files: - gajim/common/client.py - gajim/common/dbus/music_track.py - gajim/common/modules/user_tune.py - gajim/gtk/application.py Changes: ===================================== gajim/common/client.py ===================================== @@ -454,6 +454,9 @@ def _finish_connect(self) -> None: self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() + if app.settings.get_account_setting(self._account, 'publish_tune'): + self.get_module('UserTune').set_enabled(True) + self.notify('state-changed', SimpleClientState.CONNECTED) app.ged.raise_event(SignedIn(account=self._account, conn=self)) ===================================== gajim/common/dbus/music_track.py ===================================== @@ -22,6 +22,7 @@ from typing import Optional import logging +import sys from gi.repository import Gio from gi.repository import GLib @@ -49,6 +50,10 @@ def __init__(self): self.players = {} self.connection = None self._current_tune = None + self._running = False + + if sys.platform not in ('win32', 'darwin'): + self.start() def _emit(self, info: Optional[TuneData]) -> None: self._current_tune = info @@ -59,6 +64,9 @@ def current_tune(self) -> Optional[TuneData]: return self._current_tune def start(self): + if self._running: + return + proxy = Gio.DBusProxy.new_for_bus_sync( Gio.BusType.SESSION, Gio.DBusProxyFlags.NONE, @@ -96,6 +104,8 @@ def start(self): for name in list(self.players): self._get_playing_track(name) + self._running = True + def stop(self): for name in list(self.players): if name.startswith(MPRIS_PLAYER_PREFIX): @@ -203,7 +213,3 @@ def proxy_call_finished(proxy, res): None, proxy_call_finished) - -def enable(): - listener = MusicTrackListener.get() - listener.start() ===================================== gajim/common/modules/user_tune.py ===================================== @@ -44,11 +44,6 @@ def __init__(self, con): self._current_tune: Optional[TuneData] = None self._contact_tunes: dict[JID, TuneData] = {} - self.register_events([ - ('music-track-changed', ged.CORE, self._on_music_track_changed), - ('signed-in', ged.CORE, self._on_signed_in), - ]) - def get_current_tune(self) -> Optional[TuneData]: return self._current_tune @@ -88,8 +83,13 @@ def set_tune(self, tune, force=False): def set_enabled(self, enable): if enable: + self.register_events([ + ('music-track-changed', ged.CORE, self._on_music_track_changed), + ('signed-in', ged.CORE, self._on_signed_in), + ]) self._publish_current_tune() else: + self.unregister_events() self.set_tune(None, force=True) def _publish_current_tune(self): ===================================== gajim/gtk/application.py ===================================== @@ -63,7 +63,6 @@ from gajim.common.application import CoreApplication from gajim.common.const import GAJIM_FAQ_URI from gajim.common.const import GAJIM_WIKI_URI -from gajim.common.dbus import music_track from gajim.common.exceptions import GajimGeneralException from gajim.common.helpers import load_json from gajim.common.helpers import open_uri @@ -239,9 +238,6 @@ def _startup(self, _application: GajimApplication) -> None: from gajim.gui.status_icon import StatusIcon self.systray = StatusIcon() - if sys.platform not in ('win32', 'darwin'): - music_track.enable() - self.add_actions() self._load_shortcuts() menus.build_accounts_menu() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b51f1a3ace068511ee4415ce3085367… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b51f1a3ace068511ee4415ce3085367… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix line breaks in rendered CONTRIBUTING.md
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e06df9fe by André Apitzsch at 2022-04-02T17:43:37+00:00 fix: Fix line breaks in rendered CONTRIBUTING.md - - - - - 1 changed file: - CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== @@ -4,14 +4,14 @@ # Project ## Versioning -┌────── Major (Will not change unless we switch GTK version) -│ ┌───── Minor (Changes when new features are introduced -│ │ ┌─── Micro (Used for hotfixes and small changes) -│ │ │ ┌─── Only used while developing -│ │ │ │ -│ │ │ │ -│ │ │ │ -│ │ │ │ +┌────── Major (Will not change unless we switch GTK version) +│ ┌───── Minor (Changes when new features are introduced +│ │ ┌──── Micro (Used for hotfixes and small changes) +│ │ │ ┌─── Only used while developing +│ │ │ │ +│ │ │ │ +│ │ │ │ +│ │ │ │ 1.3.3-dev1 ## Branches View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e06df9fe949562f9c47ec0be2a4e5189… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e06df9fe949562f9c47ec0be2a4e5189… 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 April 2022