hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Fix deprecation warnings

Browse Source
This commit is contained in:
Philipp Hörist
2018-12-31 11:08:40 +01:00
parent 567841fdff
commit 5eac5b337a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
omemo/gtk/key.py
View File

@@ -46,8 +46,7 @@ TRUST_DATA = {
class KeyDialog(Gtk.Dialog): class KeyDialog(Gtk.Dialog):
def __init__(self, plugin, contact, transient, windowinstances, def __init__(self, plugin, contact, transient, windowinstances,
groupchat=False): groupchat=False):
flags = Gtk.DialogFlags.DESTROY_WITH_PARENT super().__init__(title=_('OMEMO Fingerprints'), destroy_with_parent=True)
super().__init__(_('OMEMO Fingerprints'), None, flags)
self.set_transient_for(transient) self.set_transient_for(transient)
self.set_resizable(True) self.set_resizable(True)
@@ -66,7 +65,7 @@ class KeyDialog(Gtk.Dialog):
# Header # Header
jid = self._contact.jid jid = self._contact.jid
self._header = Gtk.Label(_('Fingerprints for %s') % jid) self._header = Gtk.Label(label=_('Fingerprints for %s') % jid)
self._header.get_style_context().add_class('bold') self._header.get_style_context().add_class('bold')
self._header.get_style_context().add_class('dim-label') self._header.get_style_context().add_class('dim-label')
@@ -80,7 +79,7 @@ class KeyDialog(Gtk.Dialog):
self._scrolled.add(self._listbox) self._scrolled.add(self._listbox)
# Own fingerprint # Own fingerprint
self._label = Gtk.Label(_('Own Fingerprint')) self._label = Gtk.Label(label=_('Own Fingerprint'))
self._label.get_style_context().add_class('bold') self._label.get_style_context().add_class('bold')
self._label.get_style_context().add_class('dim-label') self._label.get_style_context().add_class('dim-label')
@@ -92,7 +91,7 @@ class KeyDialog(Gtk.Dialog):
ownfpr = binascii.hexlify(self.omemostate.store.getIdentityKeyPair() ownfpr = binascii.hexlify(self.omemostate.store.getIdentityKeyPair()
.getPublicKey().serialize()).decode('utf-8') .getPublicKey().serialize()).decode('utf-8')
ownfpr_format = KeyRow._format_fingerprint(ownfpr[2:]) ownfpr_format = KeyRow._format_fingerprint(ownfpr[2:])
self._ownfpr = Gtk.Label(ownfpr_format) self._ownfpr = Gtk.Label(label=ownfpr_format)
self._ownfpr.get_style_context().add_class('omemo-mono') self._ownfpr.get_style_context().add_class('omemo-mono')
self._ownfpr.set_selectable(True) self._ownfpr.set_selectable(True)
@@ -168,7 +167,7 @@ class KeyRow(Gtk.ListBoxRow):
box.add(self._trust_button) box.add(self._trust_button)
label_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) label_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
jid_label = Gtk.Label(jid) jid_label = Gtk.Label(label=jid)
jid_label.get_style_context().add_class('dim-label') jid_label.get_style_context().add_class('dim-label')
jid_label.set_selectable(False) jid_label.set_selectable(False)
jid_label.set_halign(Gtk.Align.START) jid_label.set_halign(Gtk.Align.START)
@@ -176,8 +175,7 @@ class KeyRow(Gtk.ListBoxRow):
jid_label.set_hexpand(True) jid_label.set_hexpand(True)
label_box.add(jid_label) label_box.add(jid_label)
fingerprint = Gtk.Label( fingerprint = Gtk.Label(label=self._format_fingerprint(fpr))
label=self._format_fingerprint(fpr))
fingerprint.get_style_context().add_class('omemo-mono') fingerprint.get_style_context().add_class('omemo-mono')
if not active: if not active:
fingerprint.get_style_context().add_class('omemo-inactive-color') fingerprint.get_style_context().add_class('omemo-inactive-color')