From 5dc460fc1a72a3dfe83453f4c6683be20a1a2a2d Mon Sep 17 00:00:00 2001 From: Marvin W Date: Thu, 4 May 2017 22:05:48 +0200 Subject: libdino: remove dependency to GTK+ (all GTK+ code is in main+plugins) --- plugins/openpgp/src/account_settings_entry.vala | 7 +++++-- plugins/openpgp/src/contact_details_provider.vala | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'plugins/openpgp/src') 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 keys = GPGHelper.get_keylist(key_id); -- cgit v1.2.3-70-g09d2