Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ci: Debian: Set compat level correctly
by Philipp Hörist (＠lovetox) 13 Sep '22

13 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b6b6a83 by Philipp Hörist at 2022-09-13T20:57:38+02:00 ci: Debian: Set compat level correctly - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: - debhelper-compat (>= 13), + debhelper-compat (= 13), dh-python, gettext (>= 0.17-4), libglib2.0-dev, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b6b6a83baa64c32f07c0b6c18820406… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b6b6a83baa64c32f07c0b6c18820406… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] ci: Debian: Set compat level correctly
by Philipp Hörist (＠lovetox) 13 Sep '22

13 Sep '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bfd5bfd3 by Philipp Hörist at 2022-09-13T20:53:26+02:00 ci: Debian: Set compat level correctly - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: - debhelper-compat (>= 13), + debhelper-compat (= 13), dh-python, libglib2.0-0 (>= 2.60), gir1.2-soup-2.4, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bfd5bfd36c2e392f7bb2ce41… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bfd5bfd36c2e392f7bb2ce41… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] ci: Debian: Remove compat file
by Philipp Hörist (＠lovetox) 13 Sep '22

13 Sep '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b358ff6d by Philipp Hörist at 2022-09-13T20:50:13+02:00 ci: Debian: Remove compat file - - - - - 2 changed files: - − debian/compat - debian/control Changes: ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -13 \ No newline at end of file ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: - debhelper (>= 13), + debhelper-compat (>= 13), dh-python, libglib2.0-0 (>= 2.60), gir1.2-soup-2.4, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/b358ff6d1c4848f6e0bc874a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/b358ff6d1c4848f6e0bc874a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Debian: Remove compat file
by Philipp Hörist (＠lovetox) 13 Sep '22

13 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49973aca by Philipp Hörist at 2022-09-13T20:47:02+02:00 ci: Debian: Remove compat file - - - - - 2 changed files: - − debian/compat - debian/control Changes: ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -13 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: - debhelper (>= 13), + debhelper-compat (>= 13), dh-python, gettext (>= 0.17-4), libglib2.0-dev, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49973aca5a63ffea284a6c0e94ae46a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49973aca5a63ffea284a6c0e94ae46a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preview: Show left click action tooltip on icon
by Daniel Brötzmann (＠wurstsalat) 12 Sep '22

12 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 750cc4b7 by wurstsalat at 2022-09-12T23:05:16+02:00 imprv: Preview: Show left click action tooltip on icon Fixes #11138 - - - - - 2 changed files: - gajim/gtk/preferences.py - gajim/gtk/preview.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -48,6 +48,7 @@ from .settings import SettingsDialog from .sidebar_switcher import SideBarSwitcher from .video_preview import VideoPreview +from .preview import PREVIEW_CLICK_ACTIONS from .util import open_window from .util import get_app_window from .builder import get_builder @@ -413,14 +414,6 @@ def __init__(self, *args: Any) -> None: 10485760: '10 MiB', } - actions = { - 'open': _('Open'), - 'save_as': _('Save As…'), - 'open_folder': _('Open Folder'), - 'copy_link_location': _('Copy Link Location'), - 'open_link_in_browser': _('Open Link in Browser'), - } - settings = [ Setting(SettingKind.SWITCH, _('File Preview'), @@ -465,7 +458,7 @@ def __init__(self, *args: Any) -> None: 'preview_leftclick_action', desc=_('Action when left-clicking a preview'), bind='enable_file_preview', - props={'entries': actions}), + props={'entries': PREVIEW_CLICK_ACTIONS}), Setting(SettingKind.SWITCH, _('HTTPS Verification'), ===================================== gajim/gtk/preview.py ===================================== @@ -47,6 +47,14 @@ log = logging.getLogger('gajim.gui.preview') +PREVIEW_CLICK_ACTIONS = { + 'open': _('Open'), + 'save_as': _('Save As…'), + 'open_folder': _('Open Folder'), + 'copy_link_location': _('Copy Link Location'), + 'open_link_in_browser': _('Open Link in Browser'), +} + class PreviewWidget(Gtk.Box): def __init__(self, account: str) -> None: @@ -66,6 +74,12 @@ def __init__(self, account: str) -> None: self._ui.connect_signals(self) self.add(self._ui.preview_box) + leftclick_action = app.settings.get('preview_leftclick_action') + self._ui.icon_button.set_tooltip_text( + PREVIEW_CLICK_ACTIONS[leftclick_action]) + app.settings.connect_signal( + 'preview_leftclick_action', self._update_icon_button_tooltip) + self.connect('destroy', self._on_destroy) self.show_all() @@ -73,6 +87,10 @@ def __init__(self, account: str) -> None: def _on_destroy(self, _widget: Gtk.Widget) -> None: self._destroyed = True + def _update_icon_button_tooltip(self, setting: str, *args: Any) -> None: + self._ui.icon_button.set_tooltip_text( + PREVIEW_CLICK_ACTIONS[setting]) + def get_text(self) -> str: if self._preview is None: return '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/750cc4b7c0f072e835f915c2131d76af… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/750cc4b7c0f072e835f915c2131d76af… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: ChatStack: Leave message correction on Esc
by Daniel Brötzmann (＠wurstsalat) 12 Sep '22

12 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3fd05914 by wurstsalat at 2022-09-12T22:16:48+02:00 cfix: ChatStack: Leave message correction on Esc - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -156,6 +156,11 @@ def process_escape(self) -> bool: if self.get_visible_child_name() == 'function': self._chat_function_page.process_escape() return True + + if self._message_action_box.is_correcting: + self._message_action_box.toggle_message_correction() + return True + return False def get_chat_control(self) -> ChatControl: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3fd059148c08e248fc813723dbf610f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3fd059148c08e248fc813723dbf610f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Raise PyGObject version
by Philipp Hörist (＠lovetox) 12 Sep '22

12 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 37584e22 by Philipp Hörist at 2022-09-12T21:38:28+02:00 change: Raise PyGObject version Fixes: #11132 - - - - - 3 changed files: - README.md - debian/control - gajim/gajim.py Changes: ===================================== README.md ===================================== @@ -3,7 +3,7 @@ # Welcome to Gajim ### Runtime Requirements - [Python](https://www.python.org/) (>=3.9) -- [PyGObject](https://pypi.org/project/PyGObject/) +- [PyGObject](https://pypi.org/project/PyGObject/) (>=3.42.0) - [pycairo](https://pypi.org/project/pycairo/) - [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.1.1) ===================================== debian/control ===================================== @@ -30,7 +30,7 @@ Depends: desktop-file-utils, python3 (>= 3.9), python3-css-parser (>= 1.0.2), - python3-gi (>= 3.32.0), + python3-gi (>= 3.42.0), python3-gi-cairo (>= 1.14.0~), python3-idna, python3-nbxmpp-nightly (>=20220727), ===================================== gajim/gajim.py ===================================== @@ -34,7 +34,7 @@ _MIN_NBXMPP_VER = '3.1.1' _MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' -_MIN_PYGOBJECT_VER = '3.32.0' +_MIN_PYGOBJECT_VER = '3.42.0' _MIN_GLIB_VER = '2.60.0' _MIN_PANGO_VER = '1.50.0' _MIN_SQLITE_VER = '3.33.0' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/37584e22571c0fb8af92798cbc86d3db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/37584e22571c0fb8af92798cbc86d3db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Make plugin usable check work on all unix/linux systems
by Philipp Hörist (＠lovetox) 12 Sep '22

12 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6dffa785 by Philipp Hörist at 2022-09-12T20:10:36+02:00 fix: Make plugin usable check work on all unix/linux systems Fixes #11134 - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -81,7 +81,13 @@ def __hash__(self): def is_usable(self) -> bool: if not self._check_requirements(): return False - return sys.platform in self.platforms + + platform = sys.platform + if platform not in ('win32', 'darwin'): + # sys.platform can return an unknown amount of unix/linux derivates + platform = 'others' + + return platform in self.platforms @property def is_shipped(self) -> bool: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6dffa785cccb4caf43e86118780ed893… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6dffa785cccb4caf43e86118780ed893… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Features: Show correct status for AV on Windows
by Daniel Brötzmann (＠wurstsalat) 12 Sep '22

12 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4ba7d178 by wurstsalat at 2022-09-12T09:05:41+02:00 cfix: Features: Show correct status for AV on Windows - - - - - 1 changed file: - gajim/gtk/features.py Changes: ===================================== gajim/gtk/features.py ===================================== @@ -87,6 +87,7 @@ def _add_feature(self, feature: Feature) -> None: self.feature_listbox.add(item) def _get_features(self) -> list[Feature]: + av_available = app.is_installed('AV') and sys.platform != 'win32' notification_sounds_available: bool = ( app.is_installed('GSOUND') or sys.platform in ('win32', 'darwin')) notification_sounds_enabled: bool = app.settings.get('sounds_on') @@ -105,7 +106,7 @@ def _get_features(self) -> list[Feature]: _('Feature not available under Windows'), None), Feature(_('Audio / Video'), - app.is_installed('AV'), + av_available, _('Enables Gajim to provide Audio and Video chats'), _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, ' 'gstreamer1.0-plugins-base, gstreamer1.0-plugins-ugly, ' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4ba7d178e4649a910447e8c31e79ed36… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4ba7d178e4649a910447e8c31e79ed36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Control: Correctly show MUC subject when switching
by Daniel Brötzmann (＠wurstsalat) 11 Sep '22

11 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c94a69b6 by wurstsalat at 2022-09-11T21:51:05+02:00 cfix: Control: Correctly show MUC subject when switching - - - - - 3 changed files: - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/gtk/control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -817,6 +817,7 @@ def _on_subject_change(self, _stanza: Message, properties: MessageProperties ) -> None: + if not properties.is_muc_subject: return @@ -827,13 +828,26 @@ def _on_subject_change(self, self._log.warning('No MUCData found for %s', room_jid) return - muc_subject = properties.muc_subject - if muc_subject is not None and muc_subject.timestamp is None: - muc_subject = muc_subject._replace(timestamp=time.time()) + room = self._get_contact(JID.from_string(room_jid)) + assert isinstance(room, GroupchatContact) + old_subject = muc_data.subject + + muc_subject = properties.muc_subject muc_data.subject = muc_subject - room = self._get_contact(room_jid) - room.notify('room-subject', muc_subject) + + if muc_subject is not None: + if muc_subject.timestamp is None: + muc_subject = muc_subject._replace(timestamp=time.time()) + + if old_subject is None: + muc_data.last_subject_timestamp = time.time() + room.notify('room-subject', muc_subject) + else: + # Check if we already showed that subject (rejoin) + if old_subject.text != muc_subject.text: + muc_data.last_subject_timestamp = time.time() + room.notify('room-subject', muc_subject) if muc_data.state == MUCJoinedState.JOINING: self._room_join_complete(muc_data) ===================================== gajim/common/structs.py ===================================== @@ -73,6 +73,7 @@ def __init__(self, self.error: Optional[str] = None self.error_text: Optional[str] = None self.subject: Optional[MucSubject] = None + self.last_subject_timestamp: Optional[float] = None @property def jid(self) -> JID: ===================================== gajim/gtk/control.py ===================================== @@ -92,9 +92,6 @@ def __init__(self) -> None: # Used with encryption plugins self.sendmessage = False - self._muc_subjects: dict[ - types.ChatContactT, tuple[float, MucSubject]] = {} - self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -195,12 +192,15 @@ def switch_contact(self, contact: Union[BareContact, self.add_file_transfer(transfer) if isinstance(contact, GroupchatContact): - if (app.settings.get('show_subject_on_join') or - not contact.is_joining): - timestamp, subject = self._muc_subjects.get( - contact, (None, None)) - if subject is not None: - self.conversation_view.add_muc_subject(subject, timestamp) + if (not app.settings.get('show_subject_on_join') or + contact.is_joining): + return + + muc_data = self._client.get_module('MUC').get_muc_data( + str(contact.jid)) + if muc_data is not None and muc_data.subject is not None: + self.conversation_view.add_muc_subject( + muc_data.subject, muc_data.last_subject_timestamp) def _register_events(self) -> None: if self.has_events_registered(): @@ -1153,19 +1153,9 @@ def add_muc_message(self, def _on_room_subject(self, contact: GroupchatContact, _signal_name: str, - subject: Optional[MucSubject] + subject: MucSubject ) -> None: - if subject is None: - return - - _timestamp, old_subject = self._muc_subjects.get(contact, (None, None)) - if old_subject is not None and old_subject.text == subject.text: - # Probably a rejoin, we already showed that subject - return - - self._muc_subjects[contact] = (time.time(), subject) - if (app.settings.get('show_subject_on_join') or not contact.is_joining): self.conversation_view.add_muc_subject(subject) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c94a69b6014505f31235834d64750374… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c94a69b6014505f31235834d64750374… 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