Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: cfix: ChatBanner: Correctly toggle visitor box visibility
by Daniel Brötzmann (＠wurstsalat) 11 Sep '22

11 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1b74e15d by wurstsalat at 2022-09-11T19:47:47+02:00 cfix: ChatBanner: Correctly toggle visitor box visibility - - - - - 67c88b9b by wurstsalat at 2022-09-11T19:48:19+02:00 cfix: VoiceRequestsButton: Correctly toggle button visibility - - - - - 2 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/groupchat_voice_requests_button.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -279,6 +279,9 @@ def _update_content(self) -> None: self_contact = self._contact.get_self() if self_contact: self._ui.visitor_box.set_visible(self_contact.role.is_visitor) + return + + self._ui.visitor_box.set_visible(False) def _update_account_badge(self, account: str) -> None: if self._account_badge is not None: ===================================== gajim/gtk/groupchat_voice_requests_button.py ===================================== @@ -51,11 +51,13 @@ def switch_contact(self, contact: ChatContactT) -> None: self._update() def _update(self) -> None: + self.set_no_show_all(True) + self.hide() + assert self._contact is not None client = app.get_client(self._contact.account) voice_requests = client.get_module('MUC').get_voice_requests( self._contact) - self.hide() if voice_requests: self.set_no_show_all(False) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c05702db40503c2452252b074d8f73… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c05702db40503c2452252b074d8f73… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ACE: Highlight non-default values
by Daniel Brötzmann (＠wurstsalat) 11 Sep '22

11 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9c05702d by wurstsalat at 2022-09-11T17:06:15+02:00 imprv: ACE: Highlight non-default values Fixes #11120 - - - - - 1 changed file: - gajim/gtk/advanced_config.py Changes: ===================================== gajim/gtk/advanced_config.py ===================================== @@ -43,6 +43,7 @@ class Column(IntEnum): NAME = 0 VALUE = 1 TYPE = 2 + IS_DEFAULT = 3 BOOL_DICT = { @@ -72,7 +73,7 @@ def __init__(self) -> None: treeview = self._ui.advanced_treeview self.treeview = treeview - self.model = Gtk.TreeStore(str, str, str) + self.model = Gtk.TreeStore(str, str, str, bool) self._fill_model() self.model.set_sort_column_id(0, Gtk.SortType.ASCENDING) self.modelfilter = self.model.filter_new() @@ -83,6 +84,8 @@ def __init__(self) -> None: col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), renderer_text, text=0) treeview.insert_column(col, -1) + col.set_cell_data_func(renderer_text, + self._value_column_name_callback) col.set_expand(True) col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) col.set_resizable(True) @@ -120,14 +123,30 @@ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: self.destroy() + def _value_column_name_callback(self, + _col: Gtk.TreeViewColumn, + cell: Gtk.CellRenderer, + model: Gtk.TreeModel, + iter_: Gtk.TreeIter, + _data: Optional[object] + ) -> None: + + opt_is_default = model[iter_][Column.IS_DEFAULT] + cell.set_property('weight', 400 if opt_is_default else 700) + def _value_column_data_callback(self, _col: Gtk.TreeViewColumn, cell: Gtk.CellRenderer, model: Gtk.TreeModel, iter_: Gtk.TreeIter, - _data: Optional[object]): - opttype = model[iter_][Column.TYPE] - cell.set_property('editable', opttype != SETTING_TYPES[bool]) + _data: Optional[object] + ) -> None: + + opt_type = model[iter_][Column.TYPE] + cell.set_property('editable', opt_type != SETTING_TYPES[bool]) + + opt_is_default = model[iter_][Column.IS_DEFAULT] + cell.set_property('weight', 400 if opt_is_default else 700) def _on_treeview_selection_changed(self, treeselection: Gtk.TreeSelection @@ -158,20 +177,24 @@ def _on_treeview_row_activated(self, setting_value = modelrow[Column.VALUE] != _('Activated') column_value = BOOL_DICT[setting_value] + default = APP_SETTINGS[setting] app.settings.set(setting, setting_value) modelrow[Column.VALUE] = column_value + modelrow[Column.IS_DEFAULT] = bool(setting_value == default) def _on_config_edited(self, _cell: Gtk.CellRendererText, path: str, text: str ) -> None: + treepath = Gtk.TreePath.new_from_string(path) modelpath = self.modelfilter.convert_path_to_child_path(treepath) assert modelpath modelrow = self.model[modelpath] setting = modelrow[Column.NAME] + default = APP_SETTINGS[setting] value = text if modelrow[Column.TYPE] == SETTING_TYPES[int]: @@ -179,6 +202,7 @@ def _on_config_edited(self, app.settings.set(setting, value) modelrow[Column.VALUE] = text + modelrow[Column.IS_DEFAULT] = bool(value == default) def _on_reset_button_clicked(self, button: Gtk.Button) -> None: model, iter_ = self.treeview.get_selection().get_selected() @@ -193,6 +217,8 @@ def _on_reset_button_clicked(self, button: Gtk.Button) -> None: else: model[iter_][Column.VALUE] = str(default) + model[iter_][Column.IS_DEFAULT] = True + app.settings.set(setting, default) button.set_sensitive(False) @@ -203,6 +229,9 @@ def _fill_model(self) -> None: for setting in settings: value = app.settings.get(setting) + default = APP_SETTINGS[setting] + is_default = bool(value == default) + if isinstance(value, bool): value = BOOL_DICT[value] type_ = SETTING_TYPES[bool] @@ -217,7 +246,7 @@ def _fill_model(self) -> None: else: raise ValueError - self.model.append(None, [setting, value, type_]) + self.model.append(None, [setting, value, type_, is_default]) def _visible_func(self, model: Gtk.TreeModel, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c05702db40503c2452252b074d8f738… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c05702db40503c2452252b074d8f738… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: XMLConsole: Use SourceView for XML input
by Daniel Brötzmann (＠wurstsalat) 11 Sep '22

11 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 502213ac by wurstsalat at 2022-09-11T16:34:43+02:00 imprv: XMLConsole: Use SourceView for XML input Fixes #11121 - - - - - 3 changed files: - gajim/data/gui/xml_console.ui - gajim/gtk/builder.pyi - gajim/gtk/xml_console.py Changes: ===================================== gajim/data/gui/xml_console.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <requires lib="gtksourceview" version="4.0"/> @@ -225,9 +225,16 @@ <property name="no-show-all">True</property> <property name="shadow-type">in</property> <child> - <object class="GtkTextView" id="input_entry"> + <object class="GtkSourceView" id="input_entry"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="left-margin">3</property> + <property name="right-margin">3</property> + <property name="top-margin">3</property> + <property name="bottom-margin">3</property> + <property name="monospace">True</property> + <property name="tab-width">4</property> + <property name="highlight-current-line">True</property> </object> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -915,7 +915,7 @@ class XmlConsoleBuilder(Builder): scrolled: Gtk.ScrolledWindow sourceview: GtkSource.View scrolled_input: Gtk.ScrolledWindow - input_entry: Gtk.TextView + input_entry: GtkSource.View actionbar: Gtk.ActionBar paste: Gtk.Button menubutton: Gtk.MenuButton ===================================== gajim/gtk/xml_console.py ===================================== @@ -90,11 +90,13 @@ def __init__(self) -> None: source_manager = GtkSource.LanguageManager.get_default() lang = source_manager.get_language('xml') self._ui.sourceview.get_buffer().set_language(lang) + self._ui.input_entry.get_buffer().set_language(lang) self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() style_scheme = self._get_style_scheme() if style_scheme is not None: self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) + self._ui.input_entry.get_buffer().set_style_scheme(style_scheme) self.show_all() @@ -125,6 +127,7 @@ def _on_style_changed(self, *args: Any) -> None: style_scheme = self._get_style_scheme() if style_scheme is not None: self._ui.sourceview.get_buffer().set_style_scheme(style_scheme) + self._ui.input_entry.get_buffer().set_style_scheme(style_scheme) def _on_value_change(self, combo: Gtk.ComboBox) -> None: self._selected_send_account = combo.get_active_id() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/502213aca86598af08c9b11e66f683eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/502213aca86598af08c9b11e66f683eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Use correct timestamp for evaluating message corrections
by Philipp Hörist (＠lovetox) 11 Sep '22

11 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf84868d by Philipp Hörist at 2022-09-11T09:00:35+02:00 cfix: Use correct timestamp for evaluating message corrections - - - - - 4 changed files: - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/util.py - gajim/common/storage/archive.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -315,6 +315,7 @@ def _mam_message_received(self, properties.jid, properties.body, kind, + properties.mam.timestamp, self._log): return ===================================== gajim/common/modules/message.py ===================================== @@ -201,6 +201,7 @@ def _message_received(self, from_, msgtxt, kind, + properties.timestamp, self._log): return @@ -396,7 +397,8 @@ def log_message(self, message: OutgoingMessage) -> None: None, message.message, message.correct_id, - KindConstant.CHAT_MSG_SENT) + KindConstant.CHAT_MSG_SENT, + message.timestamp) return app.storage.archive.insert_into_logs( ===================================== gajim/common/modules/util.py ===================================== @@ -128,6 +128,7 @@ def check_if_message_correction(properties: MessageProperties, jid: JID, msgtxt: str, kind: KindConstant, + timestamp: float, logger: LoggerAdapter[logging.Logger]) -> bool: correct_id = parse_correction(properties) @@ -158,7 +159,8 @@ def check_if_message_correction(properties: MessageProperties, nickname, msgtxt, correct_id, - kind) + kind, + timestamp) if not successful: logger.info('Message correction not successful') ===================================== gajim/common/storage/archive.py ===================================== @@ -990,7 +990,8 @@ def try_message_correction(self, nickname: Optional[str], corrected_text: str, correct_id: str, - kind: KindConstant) -> bool: + kind: KindConstant, + timestamp: float) -> bool: '''Try to correct a message @@ -1001,7 +1002,7 @@ def try_message_correction(self, ''' account_id = self.get_account_id(account) - max_timestamp = time.time() - MAX_MESSAGE_CORRECTION_DELAY + max_timestamp = timestamp - MAX_MESSAGE_CORRECTION_DELAY self._log.debug( 'Check if message is correctable, parameters: %s %s %s %s %s', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf84868d659a0d71783212f9b7fa629b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf84868d659a0d71783212f9b7fa629b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] cfix: Fallback to PRECIS for localpart and resourcepart
by Philipp Hörist (＠lovetox) 10 Sep '22

10 Sep '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 93bb40ad by Philipp Hörist at 2022-09-10T15:14:53+02:00 cfix: Fallback to PRECIS for localpart and resourcepart Instead of enforcing stringprep or precis, try stringprep and fallback to precis otherwise. - - - - - 3 changed files: - + nbxmpp/precis.py - nbxmpp/protocol.py - test/unit/test_jid_parsing.py Changes: ===================================== nbxmpp/precis.py ===================================== @@ -0,0 +1,19 @@ + + +from precis_i18n import get_profile + + +_localpart_disallowed_chars = set('"&\'/:<>@') + + +def enforce_precis_username(localpart: str) -> str: + if _localpart_disallowed_chars & set(localpart): + raise ValueError('Input contains prohibited codepoint: %s' % localpart) + + username = get_profile('UsernameCaseMapped') + return username.enforce(localpart) + + +def enforce_precis_opaque(resourcepart: str) -> str: + opaque = get_profile('OpaqueString') + return opaque.enforce(resourcepart) ===================================== nbxmpp/protocol.py ===================================== @@ -37,11 +37,12 @@ from dataclasses import asdict from gi.repository import GLib import idna -from precis_i18n import get_profile from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.stringprep import nodeprep from nbxmpp.stringprep import resourceprep +from nbxmpp.precis import enforce_precis_username +from nbxmpp.precis import enforce_precis_opaque def ascii_upper(s): @@ -256,7 +257,6 @@ _errorcodes = { } -_localpart_disallowed_chars = set('"&\'/:<>@') _localpart_escape_chars = ' "&\'/:<>@' @@ -487,18 +487,17 @@ def validate_localpart(localpart: str) -> str: if not localpart or len(localpart.encode()) > 1023: raise LocalpartByteLimit - if os.environ.get('NBXMPP_USE_PRECIS') is None: + if os.environ.get('NBXMPP_ENFORCE_PRECIS') is None: try: return nodeprep(localpart) except Exception: - raise LocalpartNotAllowedChar - - if _localpart_disallowed_chars & set(localpart): - raise LocalpartNotAllowedChar + try: + return enforce_precis_username(localpart) + except Exception: + raise LocalpartNotAllowedChar try: - username = get_profile('UsernameCaseMapped') - return username.enforce(localpart) + return enforce_precis_username(localpart) except Exception: raise LocalpartNotAllowedChar @@ -508,15 +507,17 @@ def validate_resourcepart(resourcepart: str) -> str: if not resourcepart or len(resourcepart.encode()) > 1023: raise ResourcepartByteLimit - if os.environ.get('NBXMPP_USE_PRECIS') is None: + if os.environ.get('NBXMPP_ENFORCE_PRECIS') is None: try: return resourceprep(resourcepart) except Exception: - raise ResourcepartNotAllowedChar + try: + return enforce_precis_opaque(resourcepart) + except Exception: + raise ResourcepartNotAllowedChar try: - opaque = get_profile('OpaqueString') - return opaque.enforce(resourcepart) + return enforce_precis_opaque(resourcepart) except Exception: raise ResourcepartNotAllowedChar ===================================== test/unit/test_jid_parsing.py ===================================== @@ -51,7 +51,7 @@ class JIDParsing(unittest.TestCase): JID.from_string(jid) def test_invalid_precis_jids(self): - os.environ['NBXMPP_USE_PRECIS'] = 'true' + os.environ['NBXMPP_ENFORCE_PRECIS'] = 'true' tests = [ ('henry\U00002163(a)example.com', LocalpartNotAllowedChar), ('\U0000265A(a)example.com', LocalpartNotAllowedChar), @@ -61,7 +61,7 @@ class JIDParsing(unittest.TestCase): with self.assertRaises(exception): JID.from_string(jid) - del os.environ['NBXMPP_USE_PRECIS'] + del os.environ['NBXMPP_ENFORCE_PRECIS'] def test_ip_literals(self): tests = [ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/93bb40ad402cefaedddfa5c4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/93bb40ad402cefaedddfa5c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MUC: Don’t ignore MUC invites when ignore_unknown_contacts is set
by Philipp Hörist (＠lovetox) 07 Sep '22

07 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9a591533 by Philipp Hörist at 2022-09-07T22:52:40+02:00 fix: MUC: Don’t ignore MUC invites when ignore_unknown_contacts is set Fixes #11107 - - - - - 2 changed files: - gajim/common/helpers.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -809,18 +809,6 @@ def load_json(path: Path, return json_dict.get(key, default) -def ignore_contact(account: str, jid: JID) -> bool: - client = app.get_client(account) - contact = client.get_module('Contacts').get_contact(jid) - - ignore_unknown = app.settings.get_account_setting( - account, 'ignore_unknown_contacts') - if ignore_unknown and not contact.is_in_roster: - log.info('Ignore unknown contact %s', str(jid)) - return True - return False - - class AdditionalDataDict(collections.UserDict): data: dict[str, Any] ===================================== gajim/common/modules/muc.py ===================================== @@ -1025,10 +1025,10 @@ def _on_invite_or_decline(self, _stanza: Message, properties: MessageProperties ) -> None: + if properties.muc_decline is not None: data = properties.muc_decline - if helpers.ignore_contact(self._account, data.from_): - raise nbxmpp.NodeProcessed + contact = self._get_contact(data.muc, groupchat=True) self._log.info('Invite declined from: %s, reason: %s', data.from_, data.reason) @@ -1040,12 +1040,10 @@ def _on_invite_or_decline(self, if properties.muc_invite is not None: data = properties.muc_invite - if helpers.ignore_contact(self._account, data.from_): - raise nbxmpp.NodeProcessed + contact = self._get_contact(data.muc, groupchat=True) self._log.info('Invite from: %s, to: %s', data.from_, data.muc) - contact = self._get_contact(data.muc, groupchat=True) if contact.is_joined: # We are already in groupchat. Ignore invitation self._log.info('We are already in this room') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9a591533c6b7f7405c0433d7c5668a8c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9a591533c6b7f7405c0433d7c5668a8c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: ShortcutWindow: Fix typo
by Philipp Hörist (＠lovetox) 07 Sep '22

07 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 60b62780 by Philipp Hörist at 2022-09-07T20:16:00+02:00 cfix: ShortcutWindow: Fix typo - - - - - 1 changed file: - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -145,7 +145,7 @@ <object class="GtkShortcutsShortcut"> <property name="visible">1</property> <property name="accelerator"><primary>1...9</property> - <property name="title" translatable="yes">Swtich Workspace</property> + <property name="title" translatable="yes">Switch Workspace</property> </object> </child> </object> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60b62780f89822c59e45c46ceadeae9e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60b62780f89822c59e45c46ceadeae9e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Make shortcuts more discoverable
by Philipp Hörist (＠lovetox) 07 Sep '22

07 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a469c759 by Philipp Hörist at 2022-09-07T20:11:14+02:00 fix: Make shortcuts more discoverable - Remove Sections so the the ShortcutWindow adds pages, which are easier to see - Add some missing shortcuts Fixes #11122, #11127 - - - - - 1 changed file: - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -61,13 +61,7 @@ </child> </object> </child> - </object> - </child> - <child> - <object class="GtkShortcutsSection"> - <property name="visible">1</property> - <property name="section-name">chat</property> - <property name="title" translatable="yes">Chat</property> + <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> @@ -79,6 +73,13 @@ <property name="title" translatable="yes">Send the message</property> </object> </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary>Up</property> + <property name="title" translatable="yes">Correct the last message</property> + </object> + </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> @@ -136,6 +137,19 @@ </child> </object> </child> + <child> + <object class="GtkShortcutsGroup"> + <property name="visible">1</property> + <property name="title" translatable="yes">Workspaces</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary>1...9</property> + <property name="title" translatable="yes">Swtich Workspace</property> + </object> + </child> + </object> + </child> <child> <object class="GtkShortcutsGroup"> <property name="visible">1</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a469c759ec55670038fb37c469dac3a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a469c759ec55670038fb37c469dac3a0… You're receiving this email because of your account on dev.gajim.org.

1 0

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

06 Sep '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f7ee69fa by Philipp Hörist at 2022-09-06T22:19:34+02:00 ci: Add debian compat file - - - - - 1 changed file: - + debian/compat Changes: ===================================== debian/compat ===================================== @@ -0,0 +1 @@ +13 \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f7ee69faa20dcf2dec6e2f7a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f7ee69faa20dcf2dec6e2f7a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] cq: Fix pylint errors
by Philipp Hörist (＠lovetox) 06 Sep '22

06 Sep '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c89e589d by Philipp Hörist at 2022-09-06T21:57:14+02:00 cq: Fix pylint errors - - - - - 2 changed files: - .ci/pylint-test.py - nbxmpp/tcp.py Changes: ===================================== .ci/pylint-test.py ===================================== @@ -32,7 +32,8 @@ def run_pylint_test(): cmd = [ 'pylint', 'nbxmpp', - f'--disable={",".join(DISABLED_CHECKS)}' + f'--disable={",".join(DISABLED_CHECKS)}', + '--ignore=examples' ] try: ===================================== nbxmpp/tcp.py ===================================== @@ -69,18 +69,22 @@ class TCPConnection(Connection): if self._con is None: return None - if min_version('GLib', '2.69.0'): - tls_con = self._con.get_base_io_stream() - return tls_con.get_protocol_version() + if not min_version('GLib', '2.69.0'): + return None + + tls_con = self._con.get_base_io_stream() + return tls_con.get_protocol_version() @property def ciphersuite(self) -> Optional[int]: if self._con is None: return None - if min_version('GLib', '2.69.0'): - tls_con = self._con.get_base_io_stream() - return tls_con.get_ciphersuite_name() + if not min_version('GLib', '2.69.0'): + return None + + tls_con = self._con.get_base_io_stream() + return tls_con.get_ciphersuite_name() def connect(self): self.state = TCPState.CONNECTING View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/c89e589dbfab2d3f5996d406… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/c89e589dbfab2d3f5996d406… 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