Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp] Pushed new tag 3.2.4
by Philipp Hörist (＠lovetox) 08 Oct '22

08 Oct '22

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

1 0

[Git][gajim/python-nbxmpp][master] release: 3.2.4
by Philipp Hörist (＠lovetox) 08 Oct '22

08 Oct '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4b377137 by Philipp Hörist at 2022-10-08T16:37:57+02:00 release: 3.2.4 - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,13 @@ +nbxmpp 3.2.4 (05 Oct 2022) + + Improvements + + * Tasks: Track timeouts within the task + + Bug Fixes + + * MUC: Relax definition of MUC config change + nbxmpp 3.2.3 (28 Sep 2022) Bug Fixes ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__: str = '3.2.3' +__version__: str = '3.2.4' ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.2.3 +version = 3.2.4 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/4b37713706ad1a67c123f559… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/4b37713706ad1a67c123f559… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 08 Oct '22

08 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 18b8babb by Weblate at 2022-10-08T16:34:53+02:00 chore: Update translations - - - - - 21 changed files: - 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 The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/18b8babb7ba93f03640109c4561784c8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/18b8babb7ba93f03640109c4561784c8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Control: Load events before messages
by Philipp Hörist (＠lovetox) 08 Oct '22

08 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 74235280 by Philipp Hörist at 2022-10-08T16:32:13+02:00 fix: Control: Load events before messages Fixes #11129 - - - - - 1 changed file: - gajim/gtk/control.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -581,27 +581,6 @@ def _fetch_n_lines_history(self, else: timestamp = row.db_timestamp - messages = app.storage.archive.get_conversation_before_after( - self.contact.account, - self.contact.jid, - before, - timestamp, - n_lines) - - if not messages: - self._scrolled_view.set_history_complete(before, True) - self._scrolled_view.block_signals(False) - return - - self.add_messages(messages) - - if len(messages) < n_lines: - self._scrolled_view.set_history_complete(before, True) - - # if self._scrolled_view.get_autoscroll(): - # if self._scrolled_view.reduce_message_count(before): - # self._scrolled_view.set_history_complete(before, False) - assert self._contact is not None for event in app.storage.events.load(self._contact, before, timestamp): if isinstance(event, events.MUCUserJoined): @@ -639,6 +618,23 @@ def _fetch_n_lines_history(self, else: raise ValueError('Unknown event: %s' % event) + messages = app.storage.archive.get_conversation_before_after( + self.contact.account, + self.contact.jid, + before, + timestamp, + n_lines) + + if not messages: + self._scrolled_view.set_history_complete(before, True) + self._scrolled_view.block_signals(False) + return + + self.add_messages(messages) + + if len(messages) < n_lines: + self._scrolled_view.set_history_complete(before, True) + self._scrolled_view.block_signals(False) def add_messages(self, messages: list[ConversationRow]): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/742352807960c05cc6d30dea616ef7b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/742352807960c05cc6d30dea616ef7b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix disabling accounts while reconnecting
by Philipp Hörist (＠lovetox) 08 Oct '22

08 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9abfda2a by Philipp Hörist at 2022-10-08T13:52:16+02:00 fix: Fix disabling accounts while reconnecting Fixes #11194 - - - - - 2 changed files: - gajim/common/client.py - gajim/gtk/accounts.py Changes: ===================================== gajim/common/client.py ===================================== @@ -568,7 +568,6 @@ def _schedule_reconnect(self) -> None: def _abort_reconnect(self) -> None: self._set_state(ClientState.DISCONNECTED) self._disable_reconnect_timer() - self.notify('state-changed', SimpleClientState.DISCONNECTED) if self._destroy_client: self._client.destroy() @@ -576,6 +575,8 @@ def _abort_reconnect(self) -> None: self._destroy_client = False self._create_client() + self.notify('state-changed', SimpleClientState.DISCONNECTED) + def _disable_reconnect_timer(self) -> None: if self._reconnect_timer_source is not None: GLib.source_remove(self._reconnect_timer_source) ===================================== gajim/gtk/accounts.py ===================================== @@ -28,9 +28,8 @@ from gi.repository import GObject from gajim.common import app -from gajim.common import ged from gajim.common import passwords -from gajim.common.events import AccountDisconnected +from gajim.common.const import ClientState from gajim.common.i18n import _ from gajim.common.i18n import Q_ from gajim.common.settings import AllSettingsT @@ -541,19 +540,10 @@ def _on_enable_switch(self, state: bool, account: str ) -> int: - def _on_disconnect(event: AccountDisconnected) -> None: - if event.account != account: - return - app.ged.remove_event_handler('account-disconnected', - ged.POSTGUI, - _on_disconnect) - app.interface.disable_account(account) def _disable() -> None: - app.ged.register_event_handler('account-disconnected', - ged.POSTGUI, - _on_disconnect) client = app.get_client(account) + client.connect_signal('state-changed', self._on_state_changed) client.change_status('offline', 'offline') switch.set_state(state) self._set_label(state) @@ -585,6 +575,15 @@ def _disable() -> None: return Gdk.EVENT_PROPAGATE + def _on_state_changed(self, + client: types.Client, + _signal_name: str, + client_state: ClientState + ) -> None: + + if client_state.is_disconnected: + app.interface.disable_account(client.account) + class AddNewAccountPage(Gtk.Box): def __init__(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9abfda2a5eb1367e55c0ae6cb68e7b0c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9abfda2a5eb1367e55c0ae6cb68e7b0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Bump shipped OMEMO version
by Daniel Brötzmann (＠wurstsalat) 08 Oct '22

08 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: af520cce by wurstsalat at 2022-10-08T13:31:11+02:00 ci: Windows: Bump shipped OMEMO version - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -150,7 +150,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install omemo plugin - curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.16.zip + curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.17.zip 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins/omemo "${BUILD_ROOT}"/omemo.zip # Install language dicts View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af520cce1f5b7421b703252ca75cd0b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af520cce1f5b7421b703252ca75cd0b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: XMLConsole: Apply account filter to all visible stanzas
by Daniel Brötzmann (＠wurstsalat) 08 Oct '22

08 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 77e3de78 by wurstsalat at 2022-10-08T12:16:43+02:00 imprv: XMLConsole: Apply account filter to all visible stanzas Before this change, setting an account filter would only filter new stanzas Fixes #11193 - - - - - 1 changed file: - gajim/gtk/xml_console.py Changes: ===================================== gajim/gtk/xml_console.py ===================================== @@ -26,6 +26,8 @@ from gajim.common import app from gajim.common import ged +from gajim.common.events import AccountDisabled +from gajim.common.events import AccountEnabled from gajim.common.events import StanzaReceived from gajim.common.events import StanzaSent from gajim.common.const import Direction @@ -55,7 +57,7 @@ def __init__(self) -> None: self.set_show_menubar(False) self.set_name('XMLConsoleWindow') - self.selected_account = 'AllAccounts' + self._selected_account = 'AllAccounts' self._selected_send_account: Optional[str] = None self.presence = True self.message = True @@ -105,9 +107,11 @@ def __init__(self) -> None: self._ui.connect_signals(self) self.register_events([ - ('stanza-received', ged.GUI1, self._nec_stanza_received), - ('stanza-sent', ged.GUI1, self._nec_stanza_sent), - ('style-changed', ged.GUI1, self._on_style_changed) + ('stanza-received', ged.GUI1, self._on_stanza_received), + ('stanza-sent', ged.GUI1, self._on_stanza_sent), + ('style-changed', ged.GUI1, self._on_style_changed), + ('account-enabled', ged.GUI1, self._on_account_changed), + ('account-disabled', ged.GUI1, self._on_account_changed) ]) def _on_destroy(self, *args: Any) -> None: @@ -124,14 +128,25 @@ def _on_value_change(self, combo: Gtk.ComboBox) -> None: self._selected_send_account = combo.get_active_id() def _set_titlebar(self) -> None: - if self.selected_account == 'AllAccounts': + if self._selected_account == 'AllAccounts': title = _('All Accounts') - elif self.selected_account == 'AccountWizard': + elif self._selected_account == 'AccountWizard': title = _('Account Wizard') else: - title = app.get_jid_from_account(self.selected_account) + title = app.get_jid_from_account(self._selected_account) self._ui.headerbar.set_subtitle(title) + def _on_account_changed(self, + event: Union[AccountEnabled, AccountDisabled] + ) -> None: + buf = self._ui.sourceview.get_buffer() + + if isinstance(event, AccountEnabled): + buf.create_tag(event.account) + else: + start, end = buf.get_bounds() + buf.remove_tag_by_name(event.account, start, end) + def _create_tags(self) -> None: tags = [ 'incoming', @@ -141,6 +156,12 @@ def _create_tags(self) -> None: 'stream', 'iq' ] + + for account in app.settings.get_active_accounts(): + tags.append(account) + + tags.append('AccountWizard') + for tag_name in tags: self._ui.sourceview.get_buffer().create_tag(tag_name) @@ -328,7 +349,7 @@ def _on_filter_options(self, _button: Gtk.Button) -> None: settings = [ Setting(SettingKind.COMBO, _('Account'), - SettingType.VALUE, self.selected_account, + SettingType.VALUE, self._selected_account, callback=self._set_account, props={'combo_items': combo_accounts}), @@ -359,7 +380,7 @@ def _on_filter_options(self, _button: Gtk.Button) -> None: _('Filter'), Gtk.DialogFlags.DESTROY_WITH_PARENT, settings, - self.selected_account or 'AllAccounts') + self._selected_account or 'AllAccounts') self.filter_dialog.connect('destroy', self._on_filter_destroyed) def _on_filter_destroyed(self, _widget: Gtk.Widget) -> None: @@ -369,9 +390,26 @@ def _on_clear(self, _button: Gtk.Button) -> None: self._ui.sourceview.get_buffer().set_text('') def _set_account(self, value: str, _data: Any) -> None: - self.selected_account = value + self._selected_account = value self._set_titlebar() + active_accounts = app.settings.get_active_accounts() + active_accounts.append('AccountWizard') + + table = self._ui.sourceview.get_buffer().get_tag_table() + + if value == 'AllAccounts': + for account in active_accounts: + tag = table.lookup(account) + if tag is not None: + tag.set_property('invisible', False) + return + + for account in active_accounts: + tag = table.lookup(account) + if tag is not None: + tag.set_property('invisible', account != value) + def _on_setting(self, value: bool, data: str) -> None: setattr(self, data, value) value = not value @@ -379,23 +417,19 @@ def _on_setting(self, value: bool, data: str) -> None: tag = table.lookup(data) if tag is None: return + if data in ('incoming', 'outgoing'): if value: tag.set_priority(table.get_size() - 1) else: tag.set_priority(0) + tag.set_property('invisible', value) - def _nec_stanza_received(self, event: StanzaReceived): - if self.selected_account != 'AllAccounts': - if event.account != self.selected_account: - return + def _on_stanza_received(self, event: StanzaReceived): self._print_stanza(event, 'incoming') - def _nec_stanza_sent(self, event: StanzaSent): - if self.selected_account != 'AllAccounts': - if event.account != self.selected_account: - return + def _on_stanza_sent(self, event: StanzaSent): self._print_stanza(event, 'outgoing') def _print_stanza(self, @@ -435,7 +469,8 @@ def _print_stanza(self, time=time.strftime('%c'), account=account_label, stanza=stanza) - buffer_.insert_with_tags_by_name(end_iter, stanza, type_, kind) + buffer_.insert_with_tags_by_name( + end_iter, stanza, type_, kind, event.account) if is_at_the_end: GLib.idle_add(scroll_to_end, self._ui.scrolled) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77e3de78f414d686dadffd3896e82336… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77e3de78f414d686dadffd3896e82336… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: SearchView: Expand help tooltip to search entry
by Daniel Brötzmann (＠wurstsalat) 08 Oct '22

08 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: fb09f28f by wurstsalat at 2022-10-08T10:47:55+02:00 cfix: SearchView: Expand help tooltip to search entry Fixes #11195 - - - - - 1 changed file: - gajim/data/gui/search_view.ui Changes: ===================================== gajim/data/gui/search_view.ui ===================================== @@ -137,6 +137,7 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-bottom">6</property> <property name="spacing">12</property> <child type="center"> <object class="GtkLabel"> @@ -211,14 +212,14 @@ <property name="width-request">200</property> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Use filters to narrow down your search: +from:username +before:yyyy-mm-dd +after:yyyy-mm-dd</property> <property name="halign">center</property> <property name="primary-icon-name">edit-find-symbolic</property> <property name="primary-icon-activatable">False</property> <property name="primary-icon-sensitive">False</property> - <property name="primary-icon-tooltip-text" translatable="yes">Use filters to narrow down your search: -from:username -before:yyyy-mm-dd -after:yyyy-mm-dd</property> <signal name="activate" handler="_on_search" swapped="no"/> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fb09f28fa1b8e8f04e1dc62fa0df615a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fb09f28fa1b8e8f04e1dc62fa0df615a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch contact-muc-context
by Daniel Brötzmann (＠wurstsalat) 08 Oct '22

08 Oct '22

Daniel Brötzmann deleted branch contact-muc-context at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: GroupchatContact: Add muc_context property
by Philipp Hörist (＠lovetox) 08 Oct '22

08 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55b2ab5b by wurstsalat at 2022-10-07T20:52:10+02:00 refactor: GroupchatContact: Add muc_context property - - - - - 5 changed files: - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/settings.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/notification_manager.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1427,16 +1427,6 @@ def get_group_chat_nick(account: str, room_jid: Union[JID, str]) -> str: return nick -def get_muc_context(jid: JID) -> Optional[str]: - disco_info = app.storage.cache.get_last_disco_info(jid) - if disco_info is None: - return None - - if (disco_info.muc_is_members_only and disco_info.muc_is_nonanonymous): - return 'private' - return 'public' - - def get_random_muc_localpart() -> str: rand = random.randrange(4) is_vowel = bool(random.getrandbits(1)) ===================================== gajim/common/modules/contacts.py ===================================== @@ -671,6 +671,16 @@ def is_irc(self) -> bool: return False return disco_info.is_irc + @property + def muc_context(self) -> Optional[str]: + disco_info = self.get_disco() + if disco_info is None: + return None + + if disco_info.muc_is_members_only and disco_info.muc_is_nonanonymous: + return 'private' + return 'public' + @property def encryption_available(self) -> bool: disco_info = self.get_disco() ===================================== gajim/common/settings.py ===================================== @@ -41,7 +41,6 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import optparser -from gajim.common.helpers import get_muc_context from gajim.common.storage.base import Encoder from gajim.common.storage.base import json_decoder from gajim.common.setting_values import APP_SETTINGS @@ -842,7 +841,9 @@ def get_group_chat_setting(self, return self._account_settings[account]['group_chat'][jid][setting] except KeyError: - context = get_muc_context(jid) + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + context = contact.muc_context if context is None: # If there is no disco info available # to determine the context assume public @@ -905,7 +906,9 @@ def set_group_chat_setting(self, default = ACCOUNT_SETTINGS['group_chat'][setting] if default in (HAS_APP_DEFAULT, HAS_ACCOUNT_DEFAULT): - context = get_muc_context(jid) + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + context = contact.muc_context if context is None: # If there is no disco info available # to determine the context assume public @@ -951,7 +954,9 @@ def set_group_chat_settings(self, for account, acc_settings in self._account_settings.items(): for jid in acc_settings['group_chat']: if context is not None: - if get_muc_context(jid) != context: + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + if contact.muc_context != context: continue self.set_group_chat_setting(account, jid, setting, value) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -40,7 +40,6 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import from_one_line from gajim.common.helpers import get_group_chat_nick -from gajim.common.helpers import get_muc_context from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import to_user_string from gajim.common.i18n import _ @@ -118,12 +117,12 @@ def __init__(self, text, additional_data) if is_previewable: - context = None - if self._is_groupchat: - context = get_muc_context(self._contact.jid) + muc_context = None + if isinstance(self._contact, GroupchatContact): + muc_context = self._contact.muc_context self._message_widget = PreviewWidget(account) app.preview_manager.create_preview( - text, self._message_widget, from_us, context) + text, self._message_widget, from_us, muc_context) else: self._message_widget = MessageWidget(account) self._message_widget.add_with_styling(text, nickname=name) ===================================== gajim/gtk/notification_manager.py ===================================== @@ -34,7 +34,6 @@ from gajim.common.events import MucInvitation from gajim.common.events import MucDecline from gajim.common.helpers import get_groupchat_name -from gajim.common.helpers import get_muc_context from .menus import get_subscription_menu from .util import open_window @@ -240,8 +239,9 @@ def add_invitation_received(self, event: MucInvitation) -> None: self.update_unread_count() jid = event.from_.bare - muc_context = get_muc_context(event.muc) - if (muc_context == 'private' and + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact(event.muc) + if (contact.muc_context == 'private' and not event.muc.bare_match(event.from_)): contact = self._client.get_module('Contacts').get_contact(jid) text = _('%(contact)s invited you to %(chat)s') % { @@ -411,8 +411,9 @@ def __init__(self, account: str, event: MucInvitation) -> None: title_label.get_style_context().add_class('bold') self.grid.attach(title_label, 2, 1, 1, 1) - muc_context = get_muc_context(event.muc) - if (muc_context == 'private' and + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact(event.muc) + if (contact.muc_context == 'private' and not event.muc.bare_match(event.from_)): contact = self._client.get_module('Contacts').get_contact(jid) invitation_text = _('%(contact)s invited you to %(chat)s') % { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55b2ab5b5e78cf6c75a1cd5be04ffa75… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55b2ab5b5e78cf6c75a1cd5be04ffa75… 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