Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
5d8a103d by wurstsalat at 2024-05-10T00:21:24+02:00
fix: ServerInfo: Don't fail if there is no certificate
Fixes #11822
- - - - -
3 changed files:
- gajim/data/gui/server_info.ui
- gajim/gtk/builder.pyi
- gajim/gtk/server_info.py
Changes:
=====================================
gajim/data/gui/server_info.ui
=====================================
@@ -439,8 +439,8 @@
<property name="spacing">12</property>
<child>
<object class="GtkScrolledWindow" id="cert_scrolled">
- <property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="no-show-all">True</property>
<child>
<placeholder/>
</child>
@@ -451,6 +451,22 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="no_certificate_label">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">No certificate</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">2</property>
=====================================
gajim/gtk/builder.pyi
=====================================
@@ -867,6 +867,7 @@ class ServerInfoBuilder(Builder):
tls_version: Gtk.Label
cipher_suite: Gtk.Label
cert_scrolled: Gtk.ScrolledWindow
+ no_certificate_label: Gtk.Label
features: Gtk.Box
features_listbox: Gtk.ListBox
clipboard_button: Gtk.Button
=====================================
gajim/gtk/server_info.py
=====================================
@@ -87,11 +87,15 @@ def __init__(self, account: str) -> None:
server_info = self._client.get_module('Discovery').server_info
self._add_contact_addresses(server_info.dataforms)
- self._cert = self._client.certificate
self._add_connection_info()
- cert_box = CertificateBox(account, self._cert)
- self._ui.cert_scrolled.add(cert_box)
+ if self._client.certificate is None:
+ self._ui.no_certificate_label.show()
+ else:
+ cert_box = CertificateBox(account, self._client.certificate)
+ self._ui.cert_scrolled.add(cert_box)
+ self._ui.cert_scrolled.show()
+ cert_box.show_all()
for feature in self._get_features():
self._add_feature(feature)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/5d8a103df56b5a5c76a7518a510f9d5f015e88e0
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/5d8a103df56b5a5c76a7518a510f9d5f015e88e0
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
