Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 2 commits: Update README.md
by Philipp Hörist 12 Mar '20

12 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 86064be3 by lovetox at 2020-03-12T22:37:25+01:00 Update README.md - - - - - 02464885 by lovetox at 2020-03-12T22:37:58+01:00 Update setup.cfg Remove pyOpenSSL dependency - - - - - 2 changed files: - README.md - setup.cfg Changes: ===================================== README.md ===================================== @@ -2,14 +2,15 @@ `python-nbxmpp` is a Python library that provides a way for Python applications to use the Jabber/XMPP network in a non-blocking way. This library was initially a fork of `xmpppy`, but is now using non-blocking sockets. +## Runtime Requirements + +- PyGObject +- GLib >= 2.60 +- libsoup +- precis-i18n + ## Features -* Asynchronous -* Supports ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1, DIGEST-MD5, PLAIN, and X-MESSENGER-OAUTH2 authentication mechanisms. -* Supports connection via proxies -* Supports TLS -* Supports [BOSH (XEP-0124)](https://xmpp.org/extensions/xep-0124.html) -* Supports [Stream Management (XEP-0198)](https://xmpp.org/extensions/xep-0198.html) * List of [supported XEPs](https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/Supported-XEPs-in-p… ## Starting Points @@ -26,3 +27,5 @@ Run the following: ### Usage To use python-nbxmpp, `import nbxmpp` in your application. + +or use the example client `python3 -m nbxmpp.examples.client` ===================================== setup.cfg ===================================== @@ -15,7 +15,6 @@ python_requires = >=3.5 packages = find: install_requires = precis-i18n>=1.0.0 - pyOpenSSL>=16.2 [options.packages.find] exclude = View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b714f7c468efe481f72d8bf… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b714f7c468efe481f72d8bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Readme: Remove reference to unavailable examples
by Philipp Hörist 12 Mar '20

12 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: fcf4e71f by André Apitzsch at 2020-03-12T19:40:47+01:00 Readme: Remove reference to unavailable examples Examples have been removed in aca509f45842dc801bc0f74c89a9abb2bd36f229. - - - - - b714f7c4 by André Apitzsch at 2020-03-12T19:40:47+01:00 Readme: Prefer pip over setup.py (aka easy_install) For differences see https://packaging.python.org/discussions/pip-vs-easy-install/. - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -16,14 +16,13 @@ * [Downloads](https://dev.gajim.org/gajim/python-nbxmpp/tags) * You can also clone the [git repository](https://dev.gajim.org/gajim/python-nbxmpp.git) -* [Examples](https://dev.gajim.org/gajim/python-nbxmpp/tree/master/doc/example… ### Setup Run the following: - sudo python setup.py install + pip install . ### Usage -To use python-nbxmpp, `import nbxmpp` in your application. Have a look at the [Examples](https://dev.gajim.org/gajim/python-nbxmpp/tree/master/doc/example… in the doc folder. +To use python-nbxmpp, `import nbxmpp` in your application. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/566ae41d7dd2e76ead0e26d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/566ae41d7dd2e76ead0e26d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] CI: Don't upload build to ftp server
by Philipp Hörist 12 Mar '20

12 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 566ae41d by André Apitzsch at 2020-03-11T22:24:15+01:00 CI: Don't upload build to ftp server - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -21,9 +21,7 @@ run-build: stage: build script: - rm -rf dist - - export FN="nbxmpp-"$(date +%F) - python3 setup.py sdist - - scp dist/nbxmpp-*.tar.gz panoramix:/var/www/gajim/downloads/snap/ci/$FN-$CI_COMMIT_SHA.tar.gz artifacts: name: "nbxmpp-$CI_COMMIT_SHA" View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/566ae41d7dd2e76ead0e26db… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/566ae41d7dd2e76ead0e26db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] RemoveAccount: Fix removing disabled accounts
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b9da8f9 by lovetox at 2020-03-11T22:22:07+01:00 RemoveAccount: Fix removing disabled accounts - - - - - 2 changed files: - gajim/gtk/remove_account.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/remove_account.py ===================================== @@ -149,7 +149,7 @@ class RemoveChoice(Page): label.set_halign(Gtk.Align.CENTER) label.set_justify(Gtk.Justification.CENTER) - service = app.connections[account].get_own_jid().getDomain() + service = app.config.get_per('accounts', account, 'hostname') check_label = Gtk.Label() check_label.set_markup( _('Do you want to unregister your account on <b>%s</b> as ' ===================================== gajim/gui_interface.py ===================================== @@ -1767,7 +1767,8 @@ class Interface: app.connections[account].disconnect(gracefully=True, reconnect=False) - self.disable_account(account) + if app.config.get_per('accounts', account, 'active'): + self.disable_account(account) app.logger.remove_roster(app.get_jid_from_account(account)) # Delete password must be before del_per() because it calls set_per() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b9da8f9ab69142848bf866254b7221d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b9da8f9ab69142848bf866254b7221d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] CI: Add pylint test
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6b2cefeb by lovetox at 2020-03-11T19:51:36+01:00 CI: Add pylint test - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -9,6 +9,13 @@ run-test: stage: test script: - python3 -m unittest discover -v + - rm -rf civenv-nbxmpp + - virtualenv -p python3 --system-site-packages civenv-nbxmpp + - . ./civenv-nbxmpp/bin/activate + - pip3 install -I pylint==2.4.4 + - python3 -m pylint nbxmpp --disable=C0103,C0201,C0301,C0325,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0401,W0601,W0614,W0621,W0622,W1201,R0201,E1101,E1135 + - deactivate + - rm -rf civenv-nbxmpp run-build: stage: build View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6b2cefebc8b325e00d1861be… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6b2cefebc8b325e00d1861be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a6ebefa by lovetox at 2020-03-11T19:07:03+01:00 Remove unused import - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -17,7 +17,6 @@ from collections import namedtuple from datetime import timedelta import nbxmpp -from nbxmpp.const import ConnectionType from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a6ebefafe0d7ee76fc864501002d538… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a6ebefafe0d7ee76fc864501002d538… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Simplify showing connection type
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 022e0e29 by lovetox at 2020-03-11T19:03:16+01:00 ServerInfo: Simplify showing connection type - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -101,16 +101,10 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): def _add_connection_info(self): # Connection type - con_type = app.connections[self.account].connection.current_connection_type - con_type_short = '' - if ConnectionType.DIRECT_TLS: - con_type_short = 'DIRECT TLS' - elif ConnectionType.START_TLS: - con_type_short = 'START TLS' - else: - con_type_short = 'PLAIN' - self._ui.connection_type.set_text(con_type_short) - if con_type is ConnectionType.PLAIN: + client = app.connections[self.account].connection + con_type = client.current_connection_type + self._ui.connection_type.set_text(con_type.value) + if con_type.is_plain: self._ui.conection_type.get_style_context().add_class( 'error-color') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/022e0e296aac1a79de774ad336e53277… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/022e0e296aac1a79de774ad336e53277… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Fix pylint errors
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9be1dfa2 by lovetox at 2020-03-11T19:00:54+01:00 Fix pylint errors - unidiomatic-typecheck - bare-except - - - - - 56581a87 by lovetox at 2020-03-11T19:00:54+01:00 Rename ConnectionType enum values - - - - - d3875505 by lovetox at 2020-03-11T19:00:54+01:00 Fix pylint errors - unused-argument - self-assigning-variable - - - - - 7 changed files: - nbxmpp/const.py - nbxmpp/idlequeue.py - nbxmpp/old_dispatcher.py - nbxmpp/protocol.py - nbxmpp/simplexml.py - nbxmpp/third_party/hsluv.py - nbxmpp/util.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -320,9 +320,9 @@ class AdHocNoteType(Enum): class ConnectionType(Enum): - DIRECT_TLS = 'ssl' - START_TLS = 'tls' - PLAIN = 'plain' + DIRECT_TLS = 'DIRECT TLS' + START_TLS = 'START TLS' + PLAIN = 'PLAIN' @property def is_direct_tls(self): ===================================== nbxmpp/idlequeue.py ===================================== @@ -185,7 +185,7 @@ class IdleCommand(IdleObject): self.idlequeue.unplug_idle(self.fd) try: self.pipe.close() - except: + except Exception: pass def pollend(self): ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -247,7 +247,7 @@ class XMPPDispatcher(PlugIn): self.RegisterEventHandler(self._owner._caller._event_dispatcher) self._register_modules() - def plugin(self, owner): + def plugin(self, _owner): """ Plug the Dispatcher instance into Client class instance and send initial stream header. Used internally @@ -343,7 +343,7 @@ class XMPPDispatcher(PlugIn): return '0' return len(data) - def RegisterNamespace(self, xmlns, order='info'): + def RegisterNamespace(self, xmlns): """ Create internal structures for newly registered namespace @@ -356,7 +356,7 @@ class XMPPDispatcher(PlugIn): self.RegisterProtocol('unknown', Protocol, xmlns=xmlns) self.RegisterProtocol('default', Protocol, xmlns=xmlns) - def RegisterProtocol(self, tag_name, proto, xmlns=None, order='info'): + def RegisterProtocol(self, tag_name, proto, xmlns=None): """ Used to declare some top-level stanza name to dispatcher @@ -406,9 +406,9 @@ class XMPPDispatcher(PlugIn): handler, name, typ, ns, xmlns, priority) if xmlns not in self.handlers: - self.RegisterNamespace(xmlns, 'warn') + self.RegisterNamespace(xmlns) if name not in self.handlers[xmlns]: - self.RegisterProtocol(name, Protocol, xmlns, 'warn') + self.RegisterProtocol(name, Protocol, xmlns) specific = typ + ns if specific not in self.handlers[xmlns][name]: @@ -673,14 +673,13 @@ class XMPPDispatcher(PlugIn): sure stanzas get ID and from tag. """ ID = None - if type(stanza) != str: - if isinstance(stanza, Protocol): + if isinstance(stanza, Protocol): + ID = stanza.getID() + if ID is None: + stanza.setID(self.getAnID()) ID = stanza.getID() - if ID is None: - stanza.setID(self.getAnID()) - ID = stanza.getID() - if self._owner._registered_name and not stanza.getAttr('from'): - stanza.setAttr('from', self._owner._registered_name) + if self._owner._registered_name and not stanza.getAttr('from'): + stanza.setAttr('from', self._owner._registered_name) self._owner.Connection.send(stanza, now) ===================================== nbxmpp/protocol.py ===================================== @@ -1021,8 +1021,10 @@ class Protocol(Node): self.setTo(self['to']) if self['from']: self.setFrom(self['from']) - if node and type(self) == type(node) and \ - self.__class__ == node.__class__ and 'id' in self.attrs: + if (node and + isinstance(node, Protocol) and + self.__class__ == node.__class__ + and 'id' in self.attrs): del self.attrs['id'] self.timestamp = None for d in self.getTags('delay', namespace=NS_DELAY2): @@ -1047,7 +1049,7 @@ class Protocol(Node): """ try: return self['to'] - except: + except Exception: pass return None @@ -1057,7 +1059,7 @@ class Protocol(Node): """ try: return self['from'] - except: + except Exception: pass return None @@ -1203,9 +1205,9 @@ class Protocol(Node): error = ErrorNode(_errorcodes[str(code)], text=error) else: error = ErrorNode(ERR_UNDEFINED_CONDITION, code=code, - typ='cancel', text=error) - elif type(error) == str: - error=ErrorNode(error) + typ='cancel', text=error) + elif isinstance(error, str): + error = ErrorNode(error) self.setType('error') self.addChild(node=error) @@ -1677,7 +1679,7 @@ class Hashes(Node): hl = None hash_ = None # file_string can be a string or a file - if type(file_string) == str: # if it is a string + if isinstance(file_string, str): if algo == 'sha-1': hl = hashlib.sha1() elif algo == 'md5': @@ -1917,7 +1919,7 @@ class Error(Protocol): if node.getType() == 'error': self.__str__ = self.__dupstr__ - def __dupstr__(self, dup1=None, dup2=None): + def __dupstr__(self, _dup1=None, _dup2=None): """ Dummy function used as preventor of creating error node in reply to error node. I.e. you will not be able to serialise "double" error into string. ===================================== nbxmpp/simplexml.py ===================================== @@ -305,7 +305,7 @@ class Node: """ try: return self.getTag(tag, namespace=namespace).attrs[attr] - except: + except Exception: return None def getTagData(self, tag): @@ -672,7 +672,7 @@ class NodeBuilder: def handle_invalid_xmpp_element(*args): raise ExpatError('Found invalid xmpp stream element: %s' % str(args)) - def handle_namespace_start(self, prefix, uri): + def handle_namespace_start(self, _prefix, _uri): """ XML Parser callback. Used internally """ ===================================== nbxmpp/third_party/hsluv.py ===================================== @@ -79,7 +79,7 @@ def _max_safe_chroma_for_l(l): _g = _g + 1 length = _distance_line_from_origin(bounds[i]) if math.isnan(_hx_min): - _hx_min = _hx_min + pass elif math.isnan(length): _hx_min = length else: @@ -98,7 +98,7 @@ def _max_chroma_for_lh(l, h): length = _length_of_ray_until_intersect(hrad, bound) if length >= 0: if math.isnan(_hx_min): - _hx_min = _hx_min + pass elif math.isnan(length): _hx_min = length else: ===================================== nbxmpp/util.py ===================================== @@ -97,7 +97,7 @@ def call_on_response(cb): if isinstance(stanza, tuple): stanza, attrs = stanza else: - stanza, attrs = stanza, {} + attrs = {} if user_data is not None: attrs['user_data'] = user_data View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/d64c941613c5a61301d61bb… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/d64c941613c5a61301d61bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DOAP: Update RFCs and fix typo
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6764c110 by Daniel Brötzmann at 2020-03-11T18:35:56+01:00 DOAP: Update RFCs and fix typo - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -37,7 +37,8 @@ <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html" /> <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html" /> <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html" /> - <implements rdf:resource="https://xmpp.org/rfcs/rfc7590.html" /> + <implements rdf:resource="https://tools.ietf.org/html/rfc7395" /> + <implements rdf:resource="https://tools.ietf.org/html/rfc7590" /> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html" /> @@ -511,7 +512,7 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0373.html" /> <xmpp:status>complete</xmpp:status> <xmpp:version>0.4.0</xmpp:version> <xmpp:note>OpenPGP plugin.</xmpp:note> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6764c110d523fe34183e889437b7db2f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6764c110d523fe34183e889437b7db2f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ServerInfo: Adapt to connection changes
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1647336e by Daniel Brötzmann at 2020-03-11T16:32:43+01:00 ServerInfo: Adapt to connection changes - - - - - 07681f61 by Daniel Brötzmann at 2020-03-11T16:33:38+01:00 CertificateDialog: Add Esc hotkey to close dialog - - - - - 3 changed files: - gajim/data/gui/server_info.ui - gajim/gtk/dialogs.py - gajim/gtk/server_info.py Changes: ===================================== gajim/data/gui/server_info.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkNotebook" id="server_info_notebook"> @@ -134,12 +134,6 @@ <property name="width">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <style> <class name="margin-18"/> </style> @@ -161,21 +155,7 @@ <property name="can_focus">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Type</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="column_homogeneous">True</property> <child> <object class="GtkLabel" id="connection_type"> <property name="visible">True</property> @@ -190,32 +170,20 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkButton" id="cert_button"> + <property name="label" translatable="yes">View _Certificate</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Security</property> - <style> - <class name="dim-label"/> - </style> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="margin_top">12</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_cert_button_clicked" swapped="no"/> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="connection_security"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label">-</property> - <property name="single_line_mode">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">3</property> + <property name="width">2</property> </packing> </child> <child> @@ -223,7 +191,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Cipher</property> + <property name="label" translatable="yes">Proxy</property> <style> <class name="dim-label"/> </style> @@ -234,12 +202,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="connection_cipher"> + <object class="GtkLabel" id="connection_proxy"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label">-</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">No proxy used</property> <property name="xalign">0</property> </object> <packing> @@ -248,67 +215,46 @@ </packing> </child> <child> - <object class="GtkLabel" id="connection_proxy_header"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Proxy</property> + <property name="label" translatable="yes">Type</property> <style> <class name="dim-label"/> </style> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="connection_proxy"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">No proxy used</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="cert_button"> - <property name="label" translatable="yes">View _Certificate</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="margin_top">12</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_cert_button_clicked" swapped="no"/> + <property name="halign">end</property> + <property name="label" translatable="yes">Protocol</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkBox" id="spacer2"> - <property name="width_request">160</property> + <object class="GtkLabel" id="connection_protocol"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <placeholder/> - </child> + <property name="halign">start</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> - <child> - <placeholder/> - </child> <style> <class name="margin-18"/> </style> ===================================== gajim/gtk/dialogs.py ===================================== @@ -226,6 +226,8 @@ class CertificateDialog(Gtk.ApplicationWindow): self._ui = get_builder('certificate_dialog.ui') self.add(self._ui.certificate_box) + self.connect('key-press-event', self._on_key_press) + self.account = account self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) @@ -269,6 +271,10 @@ class CertificateDialog(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.show_all() + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + def _on_copy_cert_info_button_clicked(self, _widget): clipboard_text = \ self._headline + '\n\n' + \ ===================================== gajim/gtk/server_info.py ===================================== @@ -17,6 +17,7 @@ from collections import namedtuple from datetime import timedelta import nbxmpp +from nbxmpp.const import ConnectionType from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk @@ -99,35 +100,30 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): row.set_header(label) def _add_connection_info(self): - ssl_con = app.connections[self.account].connection.get_ssl_connection() - ssl_version = None - cipher_name = None - if ssl_con is not None: - ssl_version = ssl_con.get_cipher_version() - cipher_name = ssl_con.get_cipher_name() - - host, proxy = app.connections[self.account].get_connection_info() - con_type = host['type'] - # Connection type - self._ui.connection_type.set_text(con_type.upper()) - if con_type == 'plain': + con_type = app.connections[self.account].connection.current_connection_type + con_type_short = '' + if ConnectionType.DIRECT_TLS: + con_type_short = 'DIRECT TLS' + elif ConnectionType.START_TLS: + con_type_short = 'START TLS' + else: + con_type_short = 'PLAIN' + self._ui.connection_type.set_text(con_type_short) + if con_type is ConnectionType.PLAIN: self._ui.conection_type.get_style_context().add_class( 'error-color') - # Connection security - if ssl_version is not None: - self._ui.connection_security.set_text(ssl_version) - - # Connection cipher - if cipher_name is not None: - self._ui.connection_cipher.set_text(cipher_name) + is_websocket = app.connections[self.account].connection.is_websocket + protocol = 'WebSocket' if is_websocket else 'TCP' + self._ui.connection_protocol.set_text(protocol) + # host, proxy = app.connections[self.account].get_connection_info() # Connection proxy - if proxy: - if proxy['type'] in ['http', 'socks5']: - self._ui.connection_proxy.set_text( - proxy['host'] + ':' + proxy['port']) + # if proxy: + # if proxy['type'] in ['http', 'socks5']: + # self._ui.connection_proxy.set_text( + # proxy['host'] + ':' + proxy['port']) self._ui.cert_button.set_sensitive(self.cert) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b38772216f7da25e5a1d5726f562039… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b38772216f7da25e5a1d5726f562039… 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