Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] ci: Update gitlab-ci.yml
by Philipp Hörist (＠lovetox) 23 May '22

23 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 242e2e4d by lovetox at 2022-05-23T22:21:12+02:00 ci: Update gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,4 +1,4 @@ -image: ci-gajim:master +image: ci-nbxmpp:master stages: - test @@ -34,6 +34,5 @@ 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/-/commit/242e2e4dba96860e05e9307b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/242e2e4dba96860e05e9307b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: ci: Update debian files
by Philipp Hörist (＠lovetox) 23 May '22

23 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6249ce7c by lovetox at 2022-05-23T21:48:57+02:00 ci: Update debian files - - - - - 325d4d2d by lovetox at 2022-05-23T21:49:23+02:00 chore: Update .gitignore - - - - - 7c1ec434 by lovetox at 2022-05-23T21:54:11+02:00 ci: Add debian build script - - - - - afb158d6 by lovetox at 2022-05-23T22:03:12+02:00 ci: Update gitlab-ci.yml - - - - - 7 changed files: - + .ci/debian_build.py - .gitignore - .gitlab-ci.yml - debian/changelog - debian/compat - debian/control - debian/copyright Changes: ===================================== .ci/debian_build.py ===================================== @@ -0,0 +1,106 @@ +#!/usr/bin/env python3 + +from __future__ import annotations + +import argparse +import dataclasses +import logging +import shutil +import subprocess +from datetime import datetime +from datetime import timezone +from pathlib import Path + +LOG_FORMAT = '%(asctime)s %(levelname)s %(message)s' +logging.basicConfig(format=LOG_FORMAT, level=logging.DEBUG) +log = logging.getLogger() + +ROOT_DIR = Path(__file__).resolve().parent.parent +BUILD_DIR = ROOT_DIR / 'debian_build' + +DATE = datetime.now().strftime('%Y%m%d') +DATE_TIME = datetime.now(tz=timezone.utc).strftime('%a, %d %b %Y %T %z') + + +(a)dataclasses.dataclass +class ReleaseContext: + app: str + pkg_name: str + rev: str + release_name: str + release_dir: Path + tarball: Path + + @classmethod + def from_tarball(cls, path: str, prefix: str, rev: str) -> ReleaseContext: + tarball = Path(path) + app = tarball.name.split('-', maxsplit=1)[0] + pkg_name = f'{prefix}{app}-nightly' + release_name = f'{pkg_name}_{DATE}' + release_dir = BUILD_DIR / release_name + return cls(app=app, + pkg_name=pkg_name, + rev=rev, + release_name=release_name, + release_dir=release_dir, + tarball=tarball) + + +def clean_build_dir() -> None: + log.info('Cleanup build directory') + if BUILD_DIR.exists(): + shutil.rmtree(BUILD_DIR) + BUILD_DIR.mkdir() + + +def prepare_package_dir(context: ReleaseContext) -> None: + log.info('Extract tarball') + tarball = Path(shutil.copy(context.tarball, BUILD_DIR)) + tarball = tarball.rename(BUILD_DIR / f'{context.release_name}.orig.tar.gz') + shutil.unpack_archive(tarball, BUILD_DIR) + + log.info('Rename dir to: %s', context.release_name) + folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] + folder = folder.rename(context.release_dir) + + log.info('Copy debian folder into release directory') + shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') + + +def prepare_changelog(context: ReleaseContext) -> None: + log.info('Prepare Changelog') + changelog = context.release_dir / 'debian' / 'changelog' + content = changelog.read_text() + content = content.replace('{DATE}', f'{DATE}-{context.rev}') + content = content.replace('{DATE_TIME}', DATE_TIME) + changelog.write_text(content) + + +def build(context: ReleaseContext) -> None: + log.info('Start package build') + subprocess.run( + [ + 'dpkg-buildpackage', + '-rfakeroot', + '--no-sign' + ], + cwd=context.release_dir, + check=True) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Build debian package') + parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz') + parser.add_argument('rev', help='The package revision e.g. 1') + parser.add_argument('--pkgprefix', default='', required=False, + help='Prefix for the package name e.g. python3-') + args = parser.parse_args() + + context = ReleaseContext.from_tarball(args.tarball, + args.pkgprefix, + args.rev) + + clean_build_dir() + prepare_package_dir(context) + prepare_changelog(context) + build(context) ===================================== .gitignore ===================================== @@ -2,6 +2,7 @@ build/ __pycache__/ .mypy_cache/ nbxmpp.egg-info +debian_build/ dist .idea *~ ===================================== .gitlab-ci.yml ===================================== @@ -5,7 +5,7 @@ stages: - build - deploy -run-test: +test-pylint: stage: test script: - python3 .ci/pylint-test.py @@ -18,10 +18,11 @@ run-test: reports: cobertura: coverage.xml -run-build: +build-linux: stage: build script: - python3 setup.py sdist + - python3 .ci/debian_build.py "$(find dist/nbxmpp-*)" 1 --pkgprefix=python3- artifacts: name: "nbxmpp-$CI_COMMIT_SHA" ===================================== debian/changelog ===================================== @@ -1,6 +1,5 @@ -python3-nbxmpp-nightly (20161014) unstable; urgency=low +python3-nbxmpp-nightly ({DATE}) unstable; urgency=low - * daily snapshot - - -- Yann Leboulanger <asterix(a)lagaule.org> Fri, 14 Oct 2016 21:23:01 +0200 + * https://dev.gajim.org/gajim/python-nbxmpp/-/commits/master + -- nbxmpp CI <ci(a)gajim.org> {DATE_TIME} ===================================== debian/compat ===================================== @@ -1 +1 @@ -9 +10 ===================================== debian/control ===================================== @@ -5,19 +5,30 @@ Maintainer: Yann Leboulanger <asterix(a)lagaule.org> Build-Depends: debhelper (>= 9), dh-python, - python3-all, + python3 (>= 3.9), python3-gi, -Standards-Version: 3.9.8 + python3-precis-i18n, +Standards-Version: 5.6.11 Homepage: https://dev.gajim.org/gajim/python-nbxmpp Vcs-Svn: https://dev.gajim.org/gajim/python-nbxmpp.git Vcs-Browser: https://dev.gajim.org/gajim/python-nbxmpp/tree/master Package: python3-nbxmpp-nightly Architecture: all -Depends: ${misc:Depends},${python3:Depends}, python3-gi, gir1.2-soup-2.4 +Depends: + ${misc:Depends}, + ${python3:Depends}, + python3 (>= 3.9), + python3-gi (>=3.32.0), + gir1.2-glib-2.0 (>= 1.48.0), + gir1.2-soup-2.4, + python3-precis-i18n, + python3-idna, Conflicts: python3-nbxmpp Description: Non blocking XMPP Python library - python-nbxmpp is a XMPP library forked from xmpppy but which uses non-blocking - sockets. It supports many authentication mechanisms, TLS, proxies, BOSH, ... - . - This is the Python 3 version of this library. + nbxmpp is a Python library that provides a way for Python applications + to use the XMPP network. This library was initially a fork of xmpppy. + + + + \ No newline at end of file ===================================== debian/copyright ===================================== @@ -1,27 +1,18 @@ -This package was debianized by Yann L. asterix(a)lagaule.org on -Tue, 27 Nov 2012 12:21:05 +0100. - -It was downloaded from: - http://python-nbxmpp.gajim.org/downloads - Upstream Authors: - Yann Leboulanger <asterix(a)lagaule.org> + - Philipp Hörist <philipp(a)hoerist.com> +Copyright: (c) 2022 Gajim Team -Copyright: (c) 2012 Gajim Team - -This program is free software; you can redistribute it and/or modify +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Debian system; see the file /usr/share/common-licenses/GPL. If not, -write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/217a40e8aaae81211044e25… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/217a40e8aaae81211044e25… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update debian build script
by Philipp Hörist (＠lovetox) 23 May '22

23 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 436fb0b6 by lovetox at 2022-05-23T21:56:03+02:00 ci: Update debian build script - - - - - 2 changed files: - .ci/debian_build.py - .gitlab-ci.yml Changes: ===================================== .ci/debian_build.py ===================================== @@ -26,19 +26,21 @@ class ReleaseContext: app: str pkg_name: str + rev: str release_name: str release_dir: Path tarball: Path @classmethod - def from_tarball(cls, path: str) -> ReleaseContext: + def from_tarball(cls, path: str, prefix: str, rev: str) -> ReleaseContext: tarball = Path(path) app = tarball.name.split('-', maxsplit=1)[0] - pkg_name = f'{app}-nightly' + pkg_name = f'{prefix}{app}-nightly' release_name = f'{pkg_name}_{DATE}' release_dir = BUILD_DIR / release_name return cls(app=app, pkg_name=pkg_name, + rev=rev, release_name=release_name, release_dir=release_dir, tarball=tarball) @@ -69,7 +71,7 @@ def prepare_changelog(context: ReleaseContext) -> None: log.info('Prepare Changelog') changelog = context.release_dir / 'debian' / 'changelog' content = changelog.read_text() - content = content.replace('{DATE}', DATE) + content = content.replace('{DATE}', f'{DATE}-{context.rev}') content = content.replace('{DATE_TIME}', DATE_TIME) changelog.write_text(content) @@ -89,9 +91,14 @@ def build(context: ReleaseContext) -> None: if __name__ == '__main__': parser = argparse.ArgumentParser(description='Build debian package') parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz') + parser.add_argument('rev', help='The package revision e.g. 1') + parser.add_argument('--pkgprefix', default='', required=False, + help='Prefix for the package name e.g. python3-') args = parser.parse_args() - context = ReleaseContext.from_tarball(args.tarball) + context = ReleaseContext.from_tarball(args.tarball, + args.pkgprefix, + args.rev) clean_build_dir() prepare_package_dir(context) ===================================== .gitlab-ci.yml ===================================== @@ -63,7 +63,7 @@ build-linux: - if: '$CI_COMMIT_TAG' script: - python3 setup.py sdist - - python3 .ci/debian_build.py "$(find dist/gajim-*)" + - python3 .ci/debian_build.py "$(find dist/gajim-*)" 1 artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/436fb0b620edb33a8146219ec4bc8569… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/436fb0b620edb33a8146219ec4bc8569… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Move docker files to other project
by Philipp Hörist (＠lovetox) 23 May '22

23 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5f4fcf19 by lovetox at 2022-05-23T20:00:00+02:00 chore: Move docker files to other project - - - - - 14b70532 by lovetox at 2022-05-23T20:01:21+02:00 ci: Debian: Update depends - - - - - 3 changed files: - debian/control - − docker/Dockerfile - − docker/requirements.txt Changes: ===================================== debian/control ===================================== @@ -20,6 +20,7 @@ Depends: python3-gi (>=3.32.0), python3-gi-cairo, gir1.2-gtk-3.0 (>=3.22), + gir1.2-gtksource-4, python3-nbxmpp-nightly (>= 20160905), python3-openssl, python3-keyring, ===================================== docker/Dockerfile deleted ===================================== @@ -1,24 +0,0 @@ -FROM python:3.9 - -ARG DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && apt-get install -y \ - apt-utils \ - appstream-util \ - libgirepository1.0-dev \ - gir1.2-gtk-3.0 \ - gir1.2-soup-2.4 \ - gir1.2-ayatanaappindicator3-0.1 \ - gettext \ - nodejs \ - npm \ - && adduser --disabled-password worker - -WORKDIR /home/worker -ENV PATH="/home/worker/.local/bin:${PATH}" -USER worker - -COPY --chown=worker:worker requirements.txt requirements.txt -RUN pip install --upgrade pip && pip install --no-cache-dir --user -r requirements.txt - -CMD bash ===================================== docker/requirements.txt deleted ===================================== @@ -1,17 +0,0 @@ -PyGObject -pycairo>=1.20 -mypy -pylint==2.12.2 -pillow -codespell -coverage -css-parser -keyring -packaging -precis-i18n -pyOpenSSL -types-pkg_resources -requests -sentry-sdk -rich -twine View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed6c3ce33d05311fa1dec2032f9516e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed6c3ce33d05311fa1dec2032f9516e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Reset conversation view when switching chat
by Philipp Hörist (＠lovetox) 23 May '22

23 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 727beb71 by lovetox at 2022-05-23T19:23:08+02:00 fix: Reset conversation view when switching chat This may help to work around the issue that sometimes the ConversationView freezes. - - - - - ed6c3ce3 by lovetox at 2022-05-23T19:23:30+02:00 ci: Windows: Rename executable - - - - - 5 changed files: - .ci/appveyor.yml - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py Changes: ===================================== .ci/appveyor.yml ===================================== @@ -33,7 +33,7 @@ build_script: - ps: | $filename = "Gajim-$($env:GAJIM_VERSION)-$($env:ARCH)" - $filename_portable = "Gajim-$($env:GAJIM_VERSION)-Portable-$($env:ARCH)" + $filename_portable = "Gajim-Portable-$($env:GAJIM_VERSION)-$($env:ARCH)" if ($env:GAJIM_VERSION -eq "Nightly") { $time_string=(get-date -UFormat "%Y-%m-%d").ToString() ===================================== gajim/gtk/chat_page.py ===================================== @@ -17,7 +17,6 @@ from typing import Optional from typing import Generator -import time import logging from gi.repository import Gdk @@ -38,7 +37,6 @@ from .chat_stack import ChatStack from .search_view import SearchView from .types import ControlT -from .const import UNLOAD_CHAT_TIME log = logging.getLogger('gajim.gui.chat_page') @@ -55,8 +53,6 @@ class ChatPage(Gtk.Box): def __init__(self): Gtk.Box.__init__(self) - self._chat_idle_time: dict[tuple[str, JID], Optional[float]] = {} - self._ui = get_builder('chat_paned.ui') self.add(self._ui.paned) self._ui.connect_signals(self) @@ -146,31 +142,6 @@ def _on_filter_revealer_toggled(self, def _on_edit_workspace_clicked(_button: Gtk.Button) -> None: app.window.activate_action('edit-workspace', GLib.Variant('s', '')) - def _reset_chat_idle_time(self, account: str, jid: JID) -> None: - # Set the idle time of the current chat to None - # and start the timer for the last one - for chat, idle_time in self._chat_idle_time.items(): - if idle_time is None: - self._chat_idle_time[chat] = time.time() - - self._chat_idle_time[(account, jid)] = None - - def unload_idle_chats(self) -> bool: - log.debug('Unload idle chats') - for chat, idle_time in list(self._chat_idle_time.items()): - if idle_time is None: - continue - - if time.time() - UNLOAD_CHAT_TIME > idle_time: - account, jid = chat - self._chat_stack.unload_chat(account, jid) - self._chat_idle_time.pop(chat) - log.debug('Chat %s:%s unloaded', account, jid) - - # Return true because we call this method with - # GLib.timeout_add_seconds() - return True - def _on_chat_selected(self, _chat_list_stack: ChatListStack, workspace_id: str, @@ -180,7 +151,6 @@ def _on_chat_selected(self, self._chat_stack.show_chat(account, jid) self._search_view.set_context(account, jid) self.emit('chat-selected', workspace_id, account, jid) - self._reset_chat_idle_time(account, jid) def _on_chat_unselected(self, _chat_list_stack: ChatListStack) -> None: self._chat_stack.clear() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -118,6 +118,8 @@ def show_chat(self, account: str, jid: JID) -> None: if self._current_control is not None: self._current_control.set_control_active(False) + self._current_control.reset_view() + control.set_control_active(True) self._current_control = control @@ -130,12 +132,6 @@ def is_chat_loaded(self, account: str, jid: JID) -> bool: return False return control.is_chat_loaded - def unload_chat(self, account: str, jid: JID) -> None: - control = self.get_control(account, jid) - if control is None: - return - control.reset_view() - def clear(self) -> None: self.set_visible_child_name('empty') self._current_control = None ===================================== gajim/gtk/const.py ===================================== @@ -55,8 +55,6 @@ class Setting(NamedTuple): # Drag and drop target type URI list (for dropped files) TARGET_TYPE_URI_LIST = 80 -UNLOAD_CHAT_TIME = 300 # seconds - @unique class Theme(IntEnum): ===================================== gajim/gtk/main.py ===================================== @@ -57,7 +57,6 @@ from .util import save_main_window_position from .util import open_window from .util import set_urgency_hint -from .const import UNLOAD_CHAT_TIME from .structs import AccountJidParam from .structs import AddChatActionParams from .structs import actionmethod @@ -145,7 +144,6 @@ def __init__(self) -> None: self._add_actions2() self._prepare_window() - self._start_timers() chat_list_stack = self._chat_page.get_chat_list_stack() app.app.systray.connect_unread_widget(chat_list_stack, @@ -155,10 +153,6 @@ def __init__(self) -> None: client.connect_signal('state-changed', self._on_client_state_changed) - def _start_timers(self) -> None: - GLib.timeout_add_seconds(UNLOAD_CHAT_TIME, - self._chat_page.unload_idle_chats) - def _prepare_window(self) -> None: if app.settings.get('main_window_skip_taskbar'): self.set_property('skip-taskbar-hint', True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/80112fedddb833fb9559c5fc29b175e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/80112fedddb833fb9559c5fc29b175e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preferences: Bind show_send_message_button to send_on_ctrl_enter
by Daniel Brötzmann (＠wurstsalat) 23 May '22

23 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 80112fed by wurstsalat at 2022-05-23T15:09:54+02:00 imprv: Preferences: Bind show_send_message_button to send_on_ctrl_enter This way, users can press Enter to insert a new line, then click Send (user-friendly) Fixes: #10671 - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -270,7 +270,8 @@ def __init__(self, *args: Any) -> None: Setting(SettingKind.SWITCH, _('Show Send Message Button'), SettingType.CONFIG, - 'show_send_message_button'), + 'show_send_message_button', + callback=self._on_show_send_message_button), Setting(SettingKind.SWITCH, _('Show Status Changes'), @@ -307,6 +308,12 @@ def _on_use_speller(value: bool, *args: Any) -> None: for ctrl in app.window.get_controls(): ctrl.set_speller() + @staticmethod + def _on_show_send_message_button(show_button: bool, *args: Any) -> None: + # Bind to send_on_ctrl_enter to make this setting user-friendly + # This way, users can press Enter to insert a new line, then click Send + app.settings.set('send_on_ctrl_enter', show_button) + class GroupChats(PreferenceBox): def __init__(self, *args: Any) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80112fedddb833fb9559c5fc29b175e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80112fedddb833fb9559c5fc29b175e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: chore: Interface: Remove unused method
by Daniel Brötzmann (＠wurstsalat) 23 May '22

23 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 890ec90b by wurstsalat at 2022-05-23T14:27:10+02:00 chore: Interface: Remove unused method - - - - - fa426918 by wurstsalat at 2022-05-23T14:37:21+02:00 chore: Interface: Move read-state-sync processing - - - - - 569beefb by wurstsalat at 2022-05-23T14:48:32+02:00 perf: MessageInputTextView: Limit chars when applying styles Part of #10828 - - - - - 3 changed files: - gajim/gtk/main.py - gajim/gtk/message_input.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -113,6 +113,7 @@ def __init__(self) -> None: ('message-moderated', ged.CORE, self._on_event), ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), + ('read-state-sync', ged.GUI1, self._on_read_state_sync), ('message-error', ged.GUI1, self._on_event), ('muc-disco-update', ged.GUI1, self._on_event), ('jingle-request-received', ged.GUI1, self._on_jingle_request), @@ -790,6 +791,21 @@ def _on_message_received(self, event: events.MessageReceived) -> None: self._main_stack.process_event(event) + def _on_read_state_sync(self, event: events.ReadStateSync) -> None: + if event.is_muc_pm: + jid = JID.from_string(event.jid.bare) + else: + jid = event.jid + + control = self.get_control(event.account, jid) + if control is None: + return + + if event.marker_id != control.last_msg_id: + return + + self.mark_as_read(event.account, jid, send_marker=False) + def _on_jingle_request(self, event: events.JingleRequestReceived) -> None: if not self.chat_exists(event.account, event.jid): for item in event.contents: ===================================== gajim/gtk/message_input.py ===================================== @@ -120,6 +120,11 @@ def _on_text_changed(self, buf: Gtk.TextBuffer) -> None: return self._clear_tags() + + if len(text) > 20000: + # Limit message styling processing + return + result = process(text) for block in result.blocks: if isinstance(block, PlainBlock): ===================================== gajim/gui_interface.py ===================================== @@ -132,7 +132,6 @@ def _create_core_handlers_list(self) -> None: 'presence-received': [self.handle_event_presence], 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], - 'read-state-sync': [self.handle_event_read_state_sync], } # pylint: enable=line-too-long @@ -209,23 +208,6 @@ def handle_event_msgnotsent(event): event.conn.name, msg_type='error') - @staticmethod - def handle_event_read_state_sync(event): - if event.type.is_groupchat: - jid = event.jid.bare - else: - jid = event.jid - - control = app.window.get_control(event.account, jid) - if control is None: - log.warning('No ChatControl found') - return - - if event.marker_id != control.last_msg_id: - return - - app.window.mark_as_read(event.account, jid, send_marker=False) - # Jingle File Transfer @staticmethod def handle_event_file_error(title: str, message: str) -> None: @@ -609,19 +591,6 @@ def change_status(self, self._change_status(acc, status) - def change_account_status(self, account: str, status: str) -> None: - ask = ask_for_status_message(status) - - client = app.get_client(account) - if status is None: - status = client.status - - if ask: - app.window.show_account_page(account) - return - - self._change_status(account, status) - @staticmethod def _change_status(account: str, status: str) -> None: client = app.get_client(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7682bd8f63a76ec1df8c9801f258057… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7682bd8f63a76ec1df8c9801f258057… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Status: Restore last status correctly
by Daniel Brötzmann (＠wurstsalat) 23 May '22

23 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7682bd8f by wurstsalat at 2022-05-23T14:23:39+02:00 fix: Status: Restore last status correctly Fixes #10867 - - - - - 2 changed files: - gajim/common/client.py - gajim/gui_interface.py Changes: ===================================== gajim/common/client.py ===================================== @@ -371,6 +371,15 @@ def change_status(self, show: str, message: str) -> None: if show != 'offline': self._status = show + app.settings.set_account_setting( + self._account, + 'last_status', + show) + app.settings.set_account_setting( + self._account, + 'last_status_msg', + helpers.to_one_line(message)) + if self._state.is_disconnecting: log.warning('Can\'t change status while ' 'disconnect is in progress') ===================================== gajim/gui_interface.py ===================================== @@ -626,12 +626,6 @@ def change_account_status(self, account: str, status: str) -> None: def _change_status(account: str, status: str) -> None: client = app.get_client(account) message = client.status_message - if status != 'offline': - app.settings.set_account_setting(account, 'last_status', status) - app.settings.set_account_setting( - account, - 'last_status_msg', - helpers.to_one_line(message)) if status == 'offline': # TODO delete pep View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7682bd8f63a76ec1df8c9801f2580573… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7682bd8f63a76ec1df8c9801f2580573… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Accounts: Fix accessing disabled accounts
by Daniel Brötzmann (＠wurstsalat) 23 May '22

23 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3780365e by wurstsalat at 2022-05-23T14:14:01+02:00 fix: Accounts: Fix accessing disabled accounts - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import cast +from typing import Optional import locale import logging @@ -33,6 +34,7 @@ from gajim.common.i18n import _ from gajim.common.i18n import Q_ from gajim.common.settings import AllSettingsT +from gajim.common import types from .dialogs import DialogButton from .dialogs import ConfirmationDialog @@ -713,7 +715,9 @@ class PrivacyPage(GenericSettingPage): def __init__(self, account: str) -> None: self._account = account - self._client = app.get_client(account) + self._client: Optional[types.Client] = None + if app.account_is_connected(account): + self._client = app.get_client(account) history_max_age = { -1: _('Forever'), @@ -840,16 +844,20 @@ def _reset_gc_send_chatstate(button: Gtk.Button) -> None: app.settings.set_group_chat_settings('send_chatstate', None) def _send_idle_time(self, state: bool, _data: Any) -> None: - self._client.get_module('LastActivity').set_enabled(state) + if self._client is not None: + self._client.get_module('LastActivity').set_enabled(state) def _send_time_info(self, state: bool, _data: Any) -> None: - self._client.get_module('EntityTime').set_enabled(state) + if self._client is not None: + self._client.get_module('EntityTime').set_enabled(state) def _send_os_info(self, state: bool, _data: Any) -> None: - self._client.get_module('SoftwareVersion').set_enabled(state) + if self._client is not None: + self._client.get_module('SoftwareVersion').set_enabled(state) def _publish_tune(self, state: bool, _data: Any) -> None: - self._client.get_module('UserTune').set_enabled(state) + if self._client is not None: + self._client.get_module('UserTune').set_enabled(state) def _send_read_marker(self, state: bool, _data: Any) -> None: app.settings.set_account_setting( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3780365edae701d8ba2a6dd8c81a1ea7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3780365edae701d8ba2a6dd8c81a1ea7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Accounts: Fix linter warnings
by Daniel Brötzmann (＠wurstsalat) 23 May '22

23 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f68c824b by wurstsalat at 2022-05-23T14:04:01+02:00 chore: Accounts: Fix linter warnings - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -747,7 +747,7 @@ def __init__(self, account: str) -> None: desc=_('Disclose the local system time of the ' 'device Gajim runs on')), - Setting(SettingKind.SWITCH, + Setting(SettingKind.SWITCH, _('Operating System'), SettingType.ACCOUNT_CONFIG, 'send_os_info', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f68c824be4a6fc90c4622b6ab335fd2d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f68c824be4a6fc90c4622b6ab335fd2d… 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