Commits March 2022

commits@gajim.org

1 participants
91 discussions

[Git][gajim/gajim] Pushed new branch set-secret-detection-config-1
by Philipp Hörist (＠lovetox) 19 Mar '22

19 Mar '22

Philipp Hörist pushed new branch set-secret-detection-config-1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/set-secret-detection-config-1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Respect global proxy setting
by Philipp Hörist (＠lovetox) 19 Mar '22

19 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6e30706f by lovetox at 2022-03-19T14:35:05+01:00 Respect global proxy setting This has gone missing at some point - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -714,7 +714,9 @@ def get_retraction_text(account: str, moderator_jid: str, def get_user_proxy(account: str) -> Optional[ProxyData]: proxy_name = app.settings.get_account_setting(account, 'proxy') if not proxy_name: - return None + proxy_name = app.settings.get('global_proxy') + if not proxy_name: + return None return get_proxy(proxy_name) def get_proxy(proxy_name: str) -> Optional[ProxyData]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e30706fdb2707a21716a2b5ad587487… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e30706fdb2707a21716a2b5ad587487… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusIcon: Don't set attention icon
by Daniel Brötzmann (＠wurstsalat) 16 Mar '22

16 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ae2b9a75 by wurstsalat at 2022-03-16T14:17:54+01:00 StatusIcon: Don't set attention icon Gajim isn't using IndicatorStatus.ATTENTION, and it seems to confuse some DEs - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -294,8 +294,6 @@ def __init__(self) -> None: 'dcraven-online', appindicator.IndicatorCategory.COMMUNICATIONS) self._status_icon.set_icon_theme_path(str(configpaths.get('ICONS'))) - self._status_icon.set_attention_icon_full('dcraven-message-new', - 'New Message') self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) self._status_icon.set_menu(self._ui.systray_context_menu) self._status_icon.set_secondary_activate_target( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae2b9a75e4ad0867b1d5b51816117084… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae2b9a75e4ad0867b1d5b51816117084… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: XMLConsole: Typing
by Daniel Brötzmann (＠wurstsalat) 16 Mar '22

16 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 15539cba by wurstsalat at 2022-03-16T11:27:13+01:00 XMLConsole: Typing - - - - - 40b417bd by wurstsalat at 2022-03-16T11:27:27+01:00 Update pyrightconfig - - - - - 2 changed files: - gajim/gtk/xml_console.py - pyrightconfig.json Changes: ===================================== gajim/gtk/xml_console.py ===================================== @@ -54,7 +54,7 @@ def __init__(self) -> None: self.set_show_menubar(False) self.set_name('XMLConsoleWindow') - self.selected_account: Optional[str] = None + self.selected_account = 'AllAccounts' self._selected_send_account: Optional[str] = None self.presence = True self.message = True @@ -98,7 +98,7 @@ def __init__(self) -> None: self.show_all() - self.connect('key_press_event', self._on_key_press) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) @@ -130,8 +130,10 @@ 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 is None: + if self.selected_account == 'AllAccounts': title = _('All Accounts') + elif self.selected_account == 'AccountWizard': + title = _('Account Wizard') else: title = app.get_jid_from_account(self.selected_account) self._ui.headerbar.set_subtitle(title) @@ -154,14 +156,14 @@ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: self._ui.search_revealer.set_reveal_child(False) return self.destroy() - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and + if (event.state & Gdk.ModifierType.CONTROL_MASK and event.keyval == Gdk.KEY_Return or event.keyval == Gdk.KEY_KP_Enter): self._on_send() - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and + if (event.state & Gdk.ModifierType.CONTROL_MASK and event.keyval == Gdk.KEY_Up): self._on_paste_last() - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and + if (event.state & Gdk.ModifierType.CONTROL_MASK and event.keyval == Gdk.KEY_f): self._ui.search_toggle.set_active( not self._ui.search_revealer.get_child_revealed()) @@ -233,7 +235,8 @@ def _on_send(self, *args: Any) -> None: node = nbxmpp.Protocol(node=stanza, attrs={'xmlns': 'jabber:client'}) client = app.get_client(self._selected_send_account) - client.connection.send(node) + assert isinstance(node, nbxmpp.Protocol) + client.connection.send_stanza(node) self.last_stanza = stanza buffer_.set_text('') @@ -327,7 +330,7 @@ def _on_filter_options(self, _button: Gtk.Button) -> None: return combo_accounts = self._get_accounts() - combo_accounts.insert(0, (None, _('All Accounts'))) + combo_accounts.insert(0, ('AllAccounts', _('All Accounts'))) settings = [ Setting(SettingKind.COMBO, _('Account'), @@ -357,9 +360,11 @@ def _on_filter_options(self, _button: Gtk.Button) -> None: callback=self._on_setting, data='outgoing'), ] - self.filter_dialog = SettingsDialog(self, _('Filter'), + self.filter_dialog = SettingsDialog(self, + _('Filter'), Gtk.DialogFlags.DESTROY_WITH_PARENT, - settings, self.selected_account) + settings, + self.selected_account or 'AllAccounts') self.filter_dialog.connect('destroy', self._on_filter_destroyed) def _on_filter_destroyed(self, _widget: Gtk.Widget) -> None: @@ -387,13 +392,13 @@ def _on_setting(self, value: bool, data: str) -> None: tag.set_property('invisible', value) def _nec_stanza_received(self, event: StanzaReceived): - if self.selected_account is not None: + if self.selected_account != 'AllAccounts': if event.account != self.selected_account: return self._print_stanza(event, 'incoming') def _nec_stanza_sent(self, event: StanzaSent): - if self.selected_account is not None: + if self.selected_account != 'AllAccounts': if event.account != self.selected_account: return self._print_stanza(event, 'outgoing') ===================================== pyrightconfig.json ===================================== @@ -87,5 +87,6 @@ "gajim/gtk/util.py", "gajim/gtk/video_preview.py", "gajim/gtk/workspace_dialog.py", + "gajim/gtk/xml_console.py" ], } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/79d5eccb02dbbb31a2785465a39ba40… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/79d5eccb02dbbb31a2785465a39ba40… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dialogs: Remove obsolete aliases
by Daniel Brötzmann (＠wurstsalat) 15 Mar '22

15 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 79d5eccb by wurstsalat at 2022-03-15T23:03:31+01:00 Dialogs: Remove obsolete aliases - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -295,9 +295,6 @@ def show(self) -> None: self.show_all() -NewConfirmationDialog = ConfirmationDialog - - class ConfirmationCheckDialog(ConfirmationDialog): def __init__(self, title: str, @@ -339,9 +336,6 @@ def _on_response(self, super()._on_response(_dialog, response) -NewConfirmationCheckDialog = ConfirmationCheckDialog - - class PastePreviewDialog(ConfirmationCheckDialog): def __init__(self, title: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/79d5eccb02dbbb31a2785465a39ba403… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/79d5eccb02dbbb31a2785465a39ba403… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Add type annotations
by Philipp Hörist (＠lovetox) 15 Mar '22

15 Mar '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4c0e15d0 by lovetox at 2022-03-15T23:18:11+01:00 Client: Add type annotations - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -16,6 +16,8 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import logging +from typing import Any +from typing import Optional from gi.repository import GLib @@ -570,8 +572,13 @@ class Client(Observable): GLib.source_remove(self._ping_source_id) self._ping_source_id = None - def send_stanza(self, stanza, now=False, callback=None, - timeout=None, user_data=None): + def send_stanza(self, + stanza: Protocol, + now: bool = False, + callback: Optional[Any] = None, + timeout: Optional[int] = None, + user_data: Optional[Any] = None) -> str: + if user_data is not None and not isinstance(user_data, dict): raise ValueError('arg user_data must be of dict type') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/4c0e15d078ae9fa6c88aa2f8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/4c0e15d078ae9fa6c88aa2f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConfirmationDialog: Fix propagating checkbutton state for DELETE_EVENT
by Daniel Brötzmann (＠wurstsalat) 15 Mar '22

15 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 5a4699ee by wurstsalat at 2022-03-15T22:51:01+01:00 ConfirmationDialog: Fix propagating checkbutton state for DELETE_EVENT Fixes #10472 - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -253,6 +253,11 @@ def __init__(self, self._buttons: dict[Gtk.ResponseType, DialogButton] = {} for button in buttons: + if button.response == Gtk.ResponseType.CANCEL: + # Map CANCEL to DELETE_EVENT. Otherwise, button args for + # CANCEL will not be propagated (i.e. checkbutton state) + self._buttons[Gtk.ResponseType.DELETE_EVENT] = button + self._buttons[button.response] = button self.add_button(button.text, button.response) if button.is_default: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a4699ee353b789cee8de96df42669ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a4699ee353b789cee8de96df42669ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Don't merge messages with different display markings
by Daniel Brötzmann (＠wurstsalat) 15 Mar '22

15 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8ea391f5 by wurstsalat at 2022-03-15T19:03:47+01:00 Don't merge messages with different display markings - - - - - 1 changed file: - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -100,6 +100,7 @@ def __init__(self, self.name = name self.text = text self.additional_data = additional_data + self.display_marking = display_marking self._account = account self._contact = contact @@ -300,6 +301,15 @@ def is_same_encryption(self, message: MessageRow) -> bool: return True return False + def is_same_display_marking(self, message: MessageRow) -> bool: + if message.display_marking == self.display_marking: + return True + if (message.display_marking is not None and + self.display_marking is not None): + if message.display_marking.name == self.display_marking.name: + return True + return False + def is_mergeable(self, message: MessageRow) -> bool: if message.type != self.type: return False @@ -307,6 +317,8 @@ def is_mergeable(self, message: MessageRow) -> bool: return False if not self.is_same_encryption(message): return False + if not self.is_same_display_marking(message): + return False return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME def on_copy_message(self, _widget: Gtk.Widget) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8ea391f5e52f7e1c86173963d8a1ad64… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8ea391f5e52f7e1c86173963d8a1ad64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GtkStatusIcon: Set tooltip for Windows
by Daniel Brötzmann (＠wurstsalat) 15 Mar '22

15 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9d5a13e7 by wurstsalat at 2022-03-15T14:28:55+01:00 GtkStatusIcon: Set tooltip for Windows - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -220,6 +220,7 @@ def __init__(self) -> None: self._hide_menuitem_added = False self._status_icon = Gtk.StatusIcon() + self._status_icon.set_tooltip_text('Gajim') # Needed for Windows self._status_icon.connect('activate', self._on_activate) self._status_icon.connect('popup-menu', self._on_popup_menu) self._status_icon.connect('size-changed', self._on_size_changed) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d5a13e7bb55001b4877da143db57fce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d5a13e7bb55001b4877da143db57fce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: CreateGroupchatWindow: Improvements
by Daniel Brötzmann (＠wurstsalat) 15 Mar '22

15 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: faffb3c2 by wurstsalat at 2022-03-15T12:45:34+01:00 CreateGroupchatWindow: Improvements - - - - - 47cc954a by wurstsalat at 2022-03-15T13:30:07+01:00 Update pyrightconfig - - - - - 4 changed files: - gajim/data/gui/groupchat_creation.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_creation.py - pyrightconfig.json Changes: ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -10,7 +10,7 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkOverlay" id="create_group_chat"> + <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can-focus">False</property> <child> @@ -350,20 +350,22 @@ </child> </object> <packing> - <property name="index">-1</property> + <property name="name">create</property> </packing> </child> - <child type="overlay"> - <object class="GtkBox" id="no_connection_box"> + <child> + <object class="GtkBox"> + <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="opacity">0.90</property> + <property name="opacity">0.9019607843137255</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">You are not connected</property> + <property name="justify">center</property> <property name="wrap">True</property> + <property name="max-width-chars">30</property> </object> <packing> <property name="expand">True</property> @@ -371,10 +373,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="solid-background"/> - </style> </object> + <packing> + <property name="name">no-connection</property> + <property name="position">1</property> + </packing> </child> </object> </interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -452,7 +452,7 @@ class GroupchatControlBuilder(Builder): class GroupchatCreationBuilder(Builder): account_liststore: Gtk.ListStore - create_group_chat: Gtk.Overlay + stack: Gtk.Stack grid: Gtk.Grid name_entry: Gtk.Entry description_entry: Gtk.Entry @@ -464,7 +464,6 @@ class GroupchatCreationBuilder(Builder): public_radio: Gtk.RadioButton spinner: Gtk.Spinner create_button: Gtk.Button - no_connection_box: Gtk.Box class GroupchatDetailsBuilder(Builder): ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -57,8 +57,9 @@ def __init__(self, account: Optional[str]) -> None: self.set_title(_('Create Group Chat')) self._ui = get_builder('groupchat_creation.ui') - self.add(self._ui.create_group_chat) + self.add(self._ui.stack) + self._account = account self._destroyed: bool = False self._create_entry_completion() @@ -76,10 +77,10 @@ def __init__(self, account: Optional[str]) -> None: if app.get_number_of_connected_accounts() == 0: # This can happen under rare circumstances - self._ui.no_connection_box.show() + self._ui.stack.set_visible_child_name('no-connection') return - self._account = self._update_accounts(account) + self._update_accounts(account) self.set_focus(self._ui.address_entry) @@ -87,11 +88,13 @@ def _on_account_state(self, _event: Union[AccountConnected, AccountDisonnected] ) -> None: any_account_connected = app.get_number_of_connected_accounts() > 0 - self._ui.no_connection_box.set_visible(not any_account_connected) if any_account_connected: - self._account = self._update_accounts() + self._ui.stack.set_visible_child_name('create') + self._update_accounts() + else: + self._ui.stack.set_visible_child_name('no-connection') - def _update_accounts(self, account: Optional[str] = None) -> str: + def _update_accounts(self, account: Optional[str] = None) -> None: accounts = app.get_enabled_accounts_with_labels(connected_only=True) account_liststore = self._ui.account_combo.get_model() assert isinstance(account_liststore, Gtk.ListStore) @@ -107,8 +110,8 @@ def _update_accounts(self, account: Optional[str] = None) -> str: account = accounts[0][0] self._ui.account_combo.set_active_id(account) + self._account = account self._fill_placeholders() - return account def _create_entry_completion(self) -> None: entry_completion = Gtk.EntryCompletion() @@ -126,9 +129,9 @@ def _fill_placeholders(self) -> None: server = self._get_muc_service_jid() self._ui.name_entry.set_placeholder_text( - placeholder[0] + _(' (optional)...')) + _('e.g. %s') % placeholder[0]) self._ui.description_entry.set_placeholder_text( - placeholder[1] + _(' (optional)...')) + _('e.g. %s' % placeholder[1])) self._ui.address_entry.set_placeholder_text( f'{placeholder[2]}@{server}') ===================================== pyrightconfig.json ===================================== @@ -51,6 +51,7 @@ "gajim/gtk/file_transfer_send.py", "gajim/gtk/groupchat_affiliation.py", "gajim/gtk/groupchat_config.py", + "gajim/gtk/groupchat_creation.py", "gajim/gtk/groupchat_details.py", "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9b72433acc96b691a29d4288d90b112… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9b72433acc96b691a29d4288d90b112… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2022