diff options
| author | Marvin W <git@larma.de> | 2017-03-13 10:35:47 +0100 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2017-03-13 10:35:47 +0100 |
| commit | bb811f8b29ed8be96664277d2b8ca8a1c9829602 (patch) | |
| tree | dceb585b18e2a3c9ef451b638ceb78ee9d531385 /plugins | |
| parent | 22c9c53b1db8b4ff6d49e5fa0406a96773c14d50 (diff) | |
| download | dino-bb811f8b29ed8be96664277d2b8ca8a1c9829602.tar.gz dino-bb811f8b29ed8be96664277d2b8ca8a1c9829602.zip | |
Do not use gpgme 1.7.0+ features yet.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/gpgme-vala/vapi/gpgme_public.vapi | 3 | ||||
| -rw-r--r-- | plugins/openpgp/src/account_settings_widget.vala | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi index 942839ac..bcf12569 100644 --- a/plugins/gpgme-vala/vapi/gpgme_public.vapi +++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi @@ -27,7 +27,8 @@ public class Key { [CCode(array_null_terminated = true)] public UserID[] uids; public KeylistMode keylist_mode; - public string fpr; + // public string fpr; // requires gpgme >= 1.7.0 + public string fpr { get { return subkeys[0].fpr; } } } [CCode (cname = "struct _gpgme_user_id")] diff --git a/plugins/openpgp/src/account_settings_widget.vala b/plugins/openpgp/src/account_settings_widget.vala index 1ebf5c58..e4077c42 100644 --- a/plugins/openpgp/src/account_settings_widget.vala +++ b/plugins/openpgp/src/account_settings_widget.vala @@ -50,6 +50,8 @@ private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget { } private void activate_current_account() { + combobox.changed.disconnect(key_changed); + string? account_key = plugin.db.get_account_key(current_account); int activate_index = 0; for (int i = 0; i < keys.size; i++) { @@ -63,6 +65,8 @@ private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget { TreeIter selected; combobox.get_active_iter(out selected); set_label_active(selected); + + combobox.changed.connect(key_changed); } private void populate_list_store() { |