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

[omemo] Dont show empty qrcode image

Browse Source
This commit is contained in:
Philipp Hörist
2018-03-23 21:06:11 +01:00
parent 6521e47679
commit ea45e2fc58
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
omemo/config_dialog.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.20.2 -->
<interface> <interface>
<requires lib="gtk+" version="3.0"/> <requires lib="gtk+" version="3.20"/>
<object class="GtkListStore" id="account_store"> <object class="GtkListStore" id="account_store">
<columns> <columns>
<!-- column-name accounts --> <!-- column-name accounts -->
@@ -170,11 +170,11 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="qrcode"> <object class="GtkImage" id="qrcode">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="no_show_all">True</property>
<property name="halign">start</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">0</property> <property name="icon_size">1</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

5
omemo/ui.py
View File

@@ -350,10 +350,13 @@ class OMEMOConfigDialog(GajimPluginConfigDialog):
if PILLOW: if PILLOW:
path = self.get_qrcode( path = self.get_qrcode(
app.get_jid_from_account(account), deviceid, ownfpr[2:]) app.get_jid_from_account(account), deviceid, ownfpr[2:])
self.qrcode.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_file(path)) pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
self.qrcode.set_from_pixbuf(pixbuf)
self.qrcode.show()
self.qrinfo.hide() self.qrinfo.hide()
else: else:
self.qrinfo.show() self.qrinfo.show()
self.qrcode.hide()
class FingerprintWindow(Gtk.Dialog): class FingerprintWindow(Gtk.Dialog):