anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix crash due to gpg binding issue

Browse source
This commit is contained in:
fiaxh 2023-10-07 16:53:37 +02:00
parent 1e167eeea6
commit 8cb195a274
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/openpgp/src/account_settings_entry.vala
View file

@ -116,8 +116,10 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry {
SourceFunc callback = fetch_keys.callback; SourceFunc callback = fetch_keys.callback;
new Thread<void*> (null, () => { // Querying GnuPG might take some time new Thread<void*> (null, () => { // Querying GnuPG might take some time
try { try {
keys = GPGHelper.get_keylist(null, true); keys = GPGHelper.get_keylist(null, true);
} catch (Error e) { } } catch (Error e) {
warning(e.message);
}
Idle.add((owned)callback); Idle.add((owned)callback);
return null; return null;
}); });

1
plugins/openpgp/src/gpgme_helper.vala
View file

@ -117,6 +117,7 @@ public static Gee.List<Key> get_keylist(string? pattern = null, bool secret_only
} catch (Error e) { } catch (Error e) {
if (e.code != GPGError.ErrorCode.EOF) throw e; if (e.code != GPGError.ErrorCode.EOF) throw e;
} }
context.op_keylist_end();
return keys; return keys;
} finally { } finally {
global_mutex.unlock(); global_mutex.unlock();

2
plugins/openpgp/vapi/gpgme.vapi
View file

@ -38,7 +38,7 @@ namespace GPG {
} }
[Compact] [Compact]
[CCode (cname = "struct _gpgme_key", ref_function = "gpgme_key_ref", ref_function_void = true, unref_function = "gpgme_key_unref", free_function = "gpgme_key_release")] [CCode (cname = "struct _gpgme_key", ref_function = "gpgme_key_ref_vapi", unref_function = "gpgme_key_unref_vapi", free_function = "gpgme_key_release")]
public class Key { public class Key {
public bool revoked; public bool revoked;
public bool expired; public bool expired;