diff options
author | Marvin W <git@larma.de> | 2017-05-04 22:05:48 +0200 |
---|---|---|
committer | Marvin W <git@larma.de> | 2017-08-17 19:53:34 +0200 |
commit | 5dc460fc1a72a3dfe83453f4c6683be20a1a2a2d (patch) | |
tree | 764b4770607e0a2997a69a5651c81e90ca3d4e99 /plugins/openpgp/src | |
parent | f78818abbee52dc187812428d3eb6542853611a0 (diff) | |
download | dino-5dc460fc1a72a3dfe83453f4c6683be20a1a2a2d.tar.gz dino-5dc460fc1a72a3dfe83453f4c6683be20a1a2a2d.zip |
libdino: remove dependency to GTK+ (all GTK+ code is in main+plugins)
Diffstat (limited to 'plugins/openpgp/src')
-rw-r--r-- | plugins/openpgp/src/account_settings_entry.vala | 7 | ||||
-rw-r--r-- | plugins/openpgp/src/contact_details_provider.vala | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/plugins/openpgp/src/account_settings_entry.vala b/plugins/openpgp/src/account_settings_entry.vala index c7d11d72..75220c30 100644 --- a/plugins/openpgp/src/account_settings_entry.vala +++ b/plugins/openpgp/src/account_settings_entry.vala @@ -16,8 +16,11 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry { return "OpenPGP"; }} - public override Plugins.AccountSettingsWidget get_widget() { - return new AccountSettingsWidget(plugin); + public override Plugins.AccountSettingsWidget? get_widget(WidgetType type) { + if (type == WidgetType.GTK) { + return new AccountSettingsWidget(plugin); + } + return null; } } diff --git a/plugins/openpgp/src/contact_details_provider.vala b/plugins/openpgp/src/contact_details_provider.vala index 39b6de2c..b9cc4b42 100644 --- a/plugins/openpgp/src/contact_details_provider.vala +++ b/plugins/openpgp/src/contact_details_provider.vala @@ -4,8 +4,8 @@ using Dino.Entities; namespace Dino.Plugins.OpenPgp { -public class ContactDetailsProvider : Plugins.ContactDetailsProvider { - public override string id { get { return "pgp_info"; } } +public class ContactDetailsProvider : Plugins.ContactDetailsProvider, Object { + public string id { get { return "pgp_info"; } } private StreamInteractor stream_interactor; @@ -13,8 +13,8 @@ public class ContactDetailsProvider : Plugins.ContactDetailsProvider { this.stream_interactor = stream_interactor; } - public override void populate(Conversation conversation, Plugins.ContactDetails contact_details) { - if (conversation.type_ == Conversation.Type.CHAT) { + public void populate(Conversation conversation, Plugins.ContactDetails contact_details, WidgetType type) { + if (conversation.type_ == Conversation.Type.CHAT && type == WidgetType.GTK) { string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, conversation.counterpart); if (key_id != null) { Gee.List<GPG.Key> keys = GPGHelper.get_keylist(key_id); |