Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 6 commits: Format helpers.py
by Philipp Hörist (＠lovetox) 20 Mar '22

20 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0f72e168 by lovetox at 2022-03-20T21:10:55+01:00 Format helpers.py - - - - - e10a4814 by lovetox at 2022-03-20T21:14:37+01:00 Remove unused methods - - - - - 33722790 by lovetox at 2022-03-20T21:17:22+01:00 Simplify import - - - - - d2b56ae9 by lovetox at 2022-03-20T21:18:23+01:00 Remove unused method - - - - - 1cf2bf41 by lovetox at 2022-03-20T21:24:38+01:00 Helpers: Add type annotations - - - - - d9762a40 by lovetox at 2022-03-20T21:26:08+01:00 Remove unused import - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -54,7 +54,6 @@ import string import webbrowser from string import Template -import urllib from datetime import datetime from datetime import timedelta from urllib.parse import unquote @@ -129,6 +128,7 @@ def parse_jid(jidstring: str) -> str: except Exception as error: raise InvalidFormat(error) + def idn_to_ascii(host: str) -> str: """ Convert IDN (Internationalized Domain Names) to ACE (ASCII-compatible @@ -144,6 +144,7 @@ def idn_to_ascii(host: str) -> str: converted_labels.append('') return ".".join(converted_labels) + def ascii_to_idn(host: str) -> str: """ Convert ACE (ASCII-compatible encoding) to IDN (Internationalized Domain @@ -156,17 +157,6 @@ def ascii_to_idn(host: str) -> str: converted_labels.append(idna.ToUnicode(label)) return ".".join(converted_labels) -def puny_encode_url(url: str) -> Optional[str]: - _url = url - if '//' not in _url: - _url = '//' + _url - try: - o = urllib.parse.urlparse(_url) - p_loc = idn_to_ascii(o.hostname) - except Exception: - log.debug('urlparse failed: %s', url) - return None - return url.replace(o.hostname, p_loc) def parse_resource(resource: str) -> Optional[str]: """ @@ -180,16 +170,13 @@ def parse_resource(resource: str) -> Optional[str]: except UnicodeError: raise InvalidFormat('Invalid character in resource.') -def windowsify(word: str) -> str: - if os.name == 'nt': - return word.capitalize() - return word def get_uf_show(show: str, use_mnemonic: bool = False) -> str: if use_mnemonic: return SHOW_STRING_MNEMONIC[show] return SHOW_STRING[show] + def get_uf_sub(sub: str) -> str: if sub == 'none': uf_sub = Q_('?Subscription we already have:None') @@ -204,6 +191,7 @@ def get_uf_sub(sub: str) -> str: return uf_sub + def get_uf_ask(ask: Union[str, None]) -> str: if ask is None: uf_ask = Q_('?Ask (for Subscription):None') @@ -214,6 +202,7 @@ def get_uf_ask(ask: Union[str, None]) -> str: return uf_ask + def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: ''' plural determines if you get Moderators or Moderator''' if not isinstance(role, str): @@ -235,6 +224,7 @@ def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: return _('Visitor') return '' + def get_uf_affiliation(affiliation: Union[Affiliation, str], plural: bool = False ) -> str: @@ -258,6 +248,7 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], return _('Member') return '' + def get_uf_relative_time(timestamp: float) -> str: date_time = datetime.fromtimestamp(timestamp) now = datetime.now() @@ -282,9 +273,6 @@ def get_uf_relative_time(timestamp: float) -> str: minutes) return _('Just now') -def get_sorted_keys(adict): - keys = sorted(adict.keys()) - return keys def to_one_line(msg: str) -> str: msg = msg.replace('\\', '\\\\') @@ -296,6 +284,7 @@ def to_one_line(msg: str) -> str: # 'test\\ntest\\\\ntest' return msg + def from_one_line(msg: str) -> str: # (?<!\\) is a lookbehind assertion which asks anything but '\' # to match the regexp that follows it @@ -311,6 +300,7 @@ def from_one_line(msg: str) -> str: # 'test\ntest\\ntest' return msg + def get_uf_chatstate(chatstate: str) -> str: """ Remove chatstate jargon and returns user friendly messages @@ -322,12 +312,13 @@ def get_uf_chatstate(chatstate: str) -> str: if chatstate == 'composing': return _('is composing a message…') if chatstate == 'paused': - #paused means he or she was composing but has stopped for a while + # paused means he or she was composing but has stopped for a while return _('paused composing a message') if chatstate == 'gone': return _('has closed the chat window or tab') return '' + def exec_command(command: str, use_shell: bool = False, posix: bool = True @@ -344,6 +335,7 @@ def exec_command(command: str, process = subprocess.Popen(args) app.thread_interface(process.wait) + def build_command(executable: str, parameter: str) -> str: # we add to the parameter (can hold path with spaces) # "" so we have good parsing from shell @@ -351,8 +343,9 @@ def build_command(executable: str, parameter: str) -> str: command = f'{executable} "{parameter}"' return command + def get_file_path_from_dnd_dropped_uri(uri: str) -> str: - path = urllib.parse.unquote(uri) # escape special chars + path = unquote(uri) # escape special chars path = path.strip('\r\n\x00') # remove \r\n and NULL # get the path to file if re.match('^file:///[a-zA-Z]:/', path): # windows @@ -363,6 +356,7 @@ def get_file_path_from_dnd_dropped_uri(uri: str) -> str: path = path[5:] # 5 is len('file:') return path + def sanitize_filename(filename: str) -> str: """ Make sure the filename we will write does contain only acceptable and latin @@ -383,6 +377,7 @@ def sanitize_filename(filename: str) -> str: return filename + def reduce_chars_newlines(text: str, max_chars: int = 0, max_lines: int = 0) -> str: """ @@ -464,7 +459,10 @@ def check_soundfile_path(file_: str, return dir_ return None -def strip_soundfile_path(file_, dirs=None, abs_=True): + +def strip_soundfile_path(file_: Union[Path, str], + dirs: Optional[list[Path]] = None, + abs_: bool = True): """ Remove knowns paths from a sound file @@ -494,6 +492,7 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): return name return file_ + def play_sound_file(str_path_to_soundfile: str, loop: bool = False) -> None: path_to_soundfile = check_soundfile_path(str_path_to_soundfile) if path_to_soundfile is None: @@ -502,6 +501,7 @@ def play_sound_file(str_path_to_soundfile: str, loop: bool = False) -> None: from gajim.common import sound sound.play(path_to_soundfile, loop) + def get_client_status(account: str) -> str: client = app.get_client(account) if client.state.is_disconnected: @@ -514,6 +514,7 @@ def get_client_status(account: str) -> str: return client.status + def get_global_show() -> str: maxi = 0 for account in app.connections: @@ -526,6 +527,7 @@ def get_global_show() -> str: maxi = index return SHOW_LIST[maxi] + def get_global_status_message() -> str: maxi = 0 status_message = '' @@ -539,6 +541,7 @@ def get_global_status_message() -> str: status_message = con.status_message return status_message + def statuses_unified() -> bool: """ Test if all statuses are the same @@ -566,6 +569,7 @@ def get_full_jid_from_iq(iq_obj: Iq) -> Optional[str]: return None return parse_jid(str(iq_obj.getFrom())) + def get_jid_from_iq(iq_obj: Iq) -> Optional[str]: """ Return the jid (without resource) from an iq @@ -575,6 +579,7 @@ def get_jid_from_iq(iq_obj: Iq) -> Optional[str]: return None return app.get_jid_without_resource(jid) + def get_auth_sha(sid: str, initiator: str, target: str) -> str: """ Return sha of sid + initiator + target used for proxy auth @@ -582,11 +587,13 @@ def get_auth_sha(sid: str, initiator: str, target: str) -> str: return hashlib.sha1( (f'{sid}{initiator}{target}').encode('utf-8')).hexdigest() + def remove_invalid_xml_chars(string_: str) -> str: if string_: string_ = re.sub(INVALID_XML_CHARS_REGEX, '', string_) return string_ + def get_random_string(count: int = 16) -> str: """ Create random string of count length @@ -661,7 +668,7 @@ def allow_sound_notification(account: str, sound_event: str) -> bool: return False -def get_optional_features(account: str) -> list[Namespace]: +def get_optional_features(account: str) -> list[str]: features: list[str] = [] if app.settings.get_account_setting(account, 'request_user_data'): @@ -684,10 +691,12 @@ def get_optional_features(account: str) -> list[Namespace]: app.plugin_manager.extension_point('update_caps', account, features) return features + def jid_is_blocked(account: str, jid: str) -> bool: con = app.connections[account] return jid in con.get_module('Blocking').blocked + def get_subscription_request_msg(account: Optional[str] = None) -> str: message = _('I would like to add you to my contact list.') if account is None: @@ -701,8 +710,11 @@ def get_subscription_request_msg(account: Optional[str] = None) -> str: message = _('Hello, I am $name. %s') % message return Template(message).safe_substitute({'name': app.nicks[account]}) -def get_retraction_text(account: str, moderator_jid: str, + +def get_retraction_text(account: str, + moderator_jid: str, reason: Optional[str]) -> str: + client = app.get_client(account) contact = client.get_module('Contacts').get_contact( moderator_jid, groupchat=True) @@ -711,12 +723,14 @@ def get_retraction_text(account: str, moderator_jid: str, text += ' ' + _('Reason: %s') % reason return text + def get_global_proxy() -> Optional[ProxyData]: proxy_name = app.settings.get('global_proxy') if not proxy_name: return None return get_proxy(proxy_name) + def get_account_proxy(account: str, fallback=True) -> Optional[ProxyData]: proxy_name = app.settings.get_account_setting(account, 'proxy') if proxy_name: @@ -726,6 +740,7 @@ def get_account_proxy(account: str, fallback=True) -> Optional[ProxyData]: return get_global_proxy() return None + def get_proxy(proxy_name: str) -> Optional[ProxyData]: try: settings = app.settings.get_proxy_settings(proxy_name) @@ -741,11 +756,13 @@ def get_proxy(proxy_name: str) -> Optional[ProxyData]: username=username, password=password) + def version_condition(current_version: str, required_version: str) -> bool: if V(current_version) < V(required_version): return False return True + def get_available_emoticon_themes() -> list[str]: files: list[Path] = [] for folder in configpaths.get('EMOTICONS').iterdir(): @@ -761,6 +778,7 @@ def get_available_emoticon_themes() -> list[str]: emoticons_themes += [file.stem for file in files if file.suffix == '.png'] return sorted(emoticons_themes) + def call_counter(func): def helper(self, restart=False): if restart: @@ -769,6 +787,7 @@ def helper(self, restart=False): return func(self) return helper + def load_json(path: Path, key: Optional[str] = None, default: Optional[Any] = None) -> Any: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24900985f9342d6fc81844685e17469… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24900985f9342d6fc81844685e17469… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Add get_global_proxy()
by Philipp Hörist (＠lovetox) 20 Mar '22

20 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6acb06af by lovetox at 2022-03-20T13:53:17+01:00 Add get_global_proxy() - - - - - 73113fc5 by lovetox at 2022-03-20T13:56:19+01:00 Rename get_user_proxy() - - - - - 24900985 by lovetox at 2022-03-20T14:31:11+01:00 Add fallback param for get_account_proxy() - - - - - 4 changed files: - gajim/common/client.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/common/preview.py Changes: ===================================== gajim/common/client.py ===================================== @@ -46,7 +46,7 @@ from gajim.common.const import ClientState from gajim.common.const import SimpleClientState from gajim.common.helpers import get_custom_host -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource from gajim.common.helpers import get_idle_status_message @@ -527,7 +527,7 @@ def _prepare_for_connect(self) -> None: 'use_plain_connection'): self._client.set_connection_types([ConnectionType.PLAIN]) - proxy = get_user_proxy(self._account) + proxy = get_account_proxy(self._account) if proxy is not None: self._client.set_proxy(proxy) ===================================== gajim/common/helpers.py ===================================== @@ -711,14 +711,21 @@ def get_retraction_text(account: str, moderator_jid: str, text += ' ' + _('Reason: %s') % reason return text -def get_user_proxy(account: str) -> Optional[ProxyData]: - proxy_name = app.settings.get_account_setting(account, 'proxy') +def get_global_proxy() -> Optional[ProxyData]: + proxy_name = app.settings.get('global_proxy') if not proxy_name: - proxy_name = app.settings.get('global_proxy') - if not proxy_name: - return None + return None return get_proxy(proxy_name) +def get_account_proxy(account: str, fallback=True) -> Optional[ProxyData]: + proxy_name = app.settings.get_account_setting(account, 'proxy') + if proxy_name: + return get_proxy(proxy_name) + + if fallback: + return get_global_proxy() + return None + def get_proxy(proxy_name: str) -> Optional[ProxyData]: try: settings = app.settings.get_proxy_settings(proxy_name) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -31,7 +31,7 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule @@ -57,7 +57,7 @@ def __init__(self, con): self._session.props.user_agent = 'Gajim %s' % app.version def _set_proxy_if_available(self): - proxy = get_user_proxy(self._account) + proxy = get_account_proxy(self._account) if proxy is None: self._proxy_resolver = None self._session.props.proxy_resolver = None ===================================== gajim/common/preview.py ===================================== @@ -34,7 +34,7 @@ from gajim.common.helpers import load_file_async from gajim.common.helpers import write_file_async from gajim.common.helpers import get_tls_error_phrase -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.preview_helpers import aes_decrypt from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import parse_fragment @@ -187,7 +187,7 @@ def _create_session(account: str) -> Tuple[ session.props.https_aliases = ['aesgcm'] session.props.ssl_strict = False - proxy = get_user_proxy(account) + proxy = get_account_proxy(account) if proxy is None: resolver = None else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6e30706fdb2707a21716a2b5ad58748… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6e30706fdb2707a21716a2b5ad58748… You're receiving this email because of your account on dev.gajim.org.

1 0

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

19 Mar '22

Philipp Hörist deleted branch set-secret-detection-config-1 at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[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

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