[seahorse] Make sure Backend is properly implemented in C.
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] Make sure Backend is properly implemented in C.
- Date: Wed, 2 May 2018 16:20:25 +0000 (UTC)
commit 445870f3e852476ab50bf4e907b310a9653c4c29
Author: Niels De Graef <nielsdegraef gmail com>
Date: Wed May 2 18:19:31 2018 +0200
Make sure Backend is properly implemented in C.
pgp/seahorse-pgp-backend.c | 13 +++++++++++--
pkcs11/seahorse-pkcs11-backend.c | 13 +++++++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
index cda6e96..d788593 100644
--- a/pgp/seahorse-pgp-backend.c
+++ b/pgp/seahorse-pgp-backend.c
@@ -42,7 +42,7 @@ enum {
PROP_LABEL,
PROP_DESCRIPTION,
PROP_ACTIONS,
- PROP_LOADED
+ PROP_LOADED
};
static SeahorsePgpBackend *pgp_backend = NULL;
@@ -205,6 +205,14 @@ seahorse_pgp_backend_get_actions (SeahorseBackend *backend)
return g_object_ref (self->actions);
}
+static gboolean
+seahorse_pgp_backend_get_loaded (SeahorseBackend *backend)
+{
+ g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (backend), FALSE);
+
+ return SEAHORSE_PGP_BACKEND (backend)->loaded;
+}
+
static void
seahorse_pgp_backend_get_property (GObject *obj,
guint prop_id,
@@ -227,7 +235,7 @@ seahorse_pgp_backend_get_property (GObject *obj,
g_value_take_object (value, seahorse_pgp_backend_get_actions (backend));
break;
case PROP_LOADED:
- g_value_set_boolean (value, SEAHORSE_PGP_BACKEND (backend)->loaded);
+ g_value_set_boolean (value, seahorse_pgp_backend_get_loaded (backend));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -318,6 +326,7 @@ seahorse_pgp_backend_iface (SeahorseBackendIface *iface)
iface->get_description = seahorse_pgp_backend_get_description;
iface->get_label = seahorse_pgp_backend_get_label;
iface->get_name = seahorse_pgp_backend_get_name;
+ iface->get_loaded = seahorse_pgp_backend_get_loaded;
}
SeahorsePgpBackend *
diff --git a/pkcs11/seahorse-pkcs11-backend.c b/pkcs11/seahorse-pkcs11-backend.c
index 15fa74f..5207413 100644
--- a/pkcs11/seahorse-pkcs11-backend.c
+++ b/pkcs11/seahorse-pkcs11-backend.c
@@ -160,7 +160,7 @@ on_initialized_registered (GObject *unused,
}
self->loaded = TRUE;
- g_object_notify (self, "loaded");
+ g_object_notify (G_OBJECT (self), "loaded");
gck_list_unref_free (modules);
g_object_unref (self);
@@ -195,6 +195,14 @@ seahorse_pkcs11_backend_get_description (SeahorseBackend *backend)
return _("X.509 certificates and related keys");
}
+static gboolean
+seahorse_pkcs11_backend_get_loaded (SeahorseBackend *backend)
+{
+ g_return_val_if_fail (SEAHORSE_IS_PKCS11_BACKEND (backend), FALSE);
+
+ return SEAHORSE_PKCS11_BACKEND (backend)->loaded;
+}
+
static GtkActionGroup *
seahorse_pkcs11_backend_get_actions (SeahorseBackend *backend)
{
@@ -223,7 +231,7 @@ seahorse_pkcs11_backend_get_property (GObject *obj,
g_value_take_object (value, seahorse_pkcs11_backend_get_actions (backend));
break;
case PROP_LOADED:
- g_value_set_boolean (value, SEAHORSE_PKCS11_BACKEND (backend)->loaded);
+ g_value_set_boolean (value, seahorse_pkcs11_backend_get_loaded (backend));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -334,6 +342,7 @@ seahorse_pkcs11_backend_iface (SeahorseBackendIface *iface)
iface->get_description = seahorse_pkcs11_backend_get_description;
iface->get_label = seahorse_pkcs11_backend_get_label;
iface->get_name = seahorse_pkcs11_backend_get_name;
+ iface->get_loaded = seahorse_pkcs11_backend_get_loaded;
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]