[seahorse/wip/nielsdg/remove-more-deprecated: 7/8] pgp: Key: Don't use g_type_class_add_private()
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/wip/nielsdg/remove-more-deprecated: 7/8] pgp: Key: Don't use g_type_class_add_private()
- Date: Tue, 19 Feb 2019 05:43:34 +0000 (UTC)
commit 633bcc0e2045235b37f590434d4872db738e0092
Author: Niels De Graef <nielsdegraef gmail com>
Date: Tue Feb 19 06:32:16 2019 +0100
pgp: Key: Don't use g_type_class_add_private()
It's been deprecated a while now in favor of `G_ADD_PRIVATE ()`
pgp/seahorse-pgp-key.c | 943 +++++++++++++++++++++++++------------------------
pgp/seahorse-pgp-key.h | 30 +-
2 files changed, 491 insertions(+), 482 deletions(-)
---
diff --git a/pgp/seahorse-pgp-key.c b/pgp/seahorse-pgp-key.c
index 1bb5f048..a6882225 100644
--- a/pgp/seahorse-pgp-key.c
+++ b/pgp/seahorse-pgp-key.c
@@ -33,32 +33,33 @@
#include <string.h>
enum {
- PROP_0,
- PROP_PHOTOS,
- PROP_SUBKEYS,
- PROP_UIDS,
- PROP_FINGERPRINT,
- PROP_VALIDITY,
- PROP_TRUST,
- PROP_EXPIRES,
- PROP_LENGTH,
- PROP_ALGO,
- PROP_DESCRIPTION
+ PROP_0,
+ PROP_PHOTOS,
+ PROP_SUBKEYS,
+ PROP_UIDS,
+ PROP_FINGERPRINT,
+ PROP_VALIDITY,
+ PROP_TRUST,
+ PROP_EXPIRES,
+ PROP_LENGTH,
+ PROP_ALGO,
+ PROP_DESCRIPTION
};
static void seahorse_pgp_key_viewable_iface (SeahorseViewableIface *iface);
+typedef struct _SeahorsePgpKeyPrivate {
+ gchar *keyid;
+ GList *uids; /* All the UID objects */
+ GList *subkeys; /* All the Subkey objects */
+ GList *photos; /* List of photos */
+} SeahorsePgpKeyPrivate;
+
G_DEFINE_TYPE_WITH_CODE (SeahorsePgpKey, seahorse_pgp_key, SEAHORSE_TYPE_OBJECT,
+ G_ADD_PRIVATE (SeahorsePgpKey)
G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEWABLE, seahorse_pgp_key_viewable_iface);
);
-struct _SeahorsePgpKeyPrivate {
- gchar *keyid;
- GList *uids; /* All the UID objects */
- GList *subkeys; /* All the Subkey objects */
- GList *photos; /* List of photos */
-};
-
/*
* PGP key ids can be of varying lengths. Shorter keyids are the last
* characters of the longer ones. When hashing match on the last 8
@@ -68,414 +69,259 @@ struct _SeahorsePgpKeyPrivate {
guint
seahorse_pgp_keyid_hash (gconstpointer v)
{
- const gchar *keyid = v;
- gsize len = strlen (keyid);
- if (len > 8)
- keyid += len - 8;
- return g_str_hash (keyid);
+ const gchar *keyid = v;
+ gsize len = strlen (keyid);
+ if (len > 8)
+ keyid += len - 8;
+ return g_str_hash (keyid);
}
gboolean
seahorse_pgp_keyid_equal (gconstpointer v1,
gconstpointer v2)
{
- const gchar *keyid_1 = v1;
- const gchar *keyid_2 = v2;
- gsize len_1 = strlen (keyid_1);
- gsize len_2 = strlen (keyid_2);
+ const gchar *keyid_1 = v1;
+ const gchar *keyid_2 = v2;
+ gsize len_1 = strlen (keyid_1);
+ gsize len_2 = strlen (keyid_2);
- if (len_1 != len_2 && len_1 >= 8 && len_2 >= 8) {
- keyid_1 += len_1 - 8;
- keyid_2 += len_2 - 8;
- }
- return g_str_equal (keyid_1, keyid_2);
+ if (len_1 != len_2 && len_1 >= 8 && len_2 >= 8) {
+ keyid_1 += len_1 - 8;
+ keyid_2 += len_2 - 8;
+ }
+ return g_str_equal (keyid_1, keyid_2);
}
-/* -----------------------------------------------------------------------------
- * INTERNAL HELPERS
- */
-
-static const gchar*
+static const gchar*
calc_short_name (SeahorsePgpKey *self)
{
- GList *uids = seahorse_pgp_key_get_uids (self);
- return uids ? seahorse_pgp_uid_get_name (uids->data) : NULL;
+ GList *uids = seahorse_pgp_key_get_uids (self);
+ return uids ? seahorse_pgp_uid_get_name (uids->data) : NULL;
}
-static gchar*
+static gchar*
calc_name (SeahorsePgpKey *self)
{
- GList *uids = seahorse_pgp_key_get_uids (self);
- return uids ? seahorse_pgp_uid_calc_label (seahorse_pgp_uid_get_name (uids->data),
- seahorse_pgp_uid_get_email (uids->data),
- seahorse_pgp_uid_get_comment (uids->data)) : g_strdup ("");
+ GList *uids = seahorse_pgp_key_get_uids (self);
+ return uids ? seahorse_pgp_uid_calc_label (seahorse_pgp_uid_get_name (uids->data),
+ seahorse_pgp_uid_get_email (uids->data),
+ seahorse_pgp_uid_get_comment (uids->data)) : g_strdup ("");
}
static gchar *
calc_markup (SeahorsePgpKey *self)
{
- guint flags = seahorse_object_get_flags (SEAHORSE_OBJECT (self));
- GList *uids;
- GString *result;
- gchar *text;
- const gchar *name;
- const gchar *email;
- const gchar *comment;
- const gchar *primary = NULL;
-
- uids = seahorse_pgp_key_get_uids (self);
-
- result = g_string_new ("<span");
- if (flags & SEAHORSE_FLAG_EXPIRED || flags & SEAHORSE_FLAG_REVOKED ||
- flags & SEAHORSE_FLAG_DISABLED)
- g_string_append (result, " strikethrough='true'");
- if (!(flags & SEAHORSE_FLAG_TRUSTED))
- g_string_append (result, " foreground='#555555'");
- g_string_append_c (result, '>');
-
- /* The first name is the key name */
- if (uids != NULL) {
- name = seahorse_pgp_uid_get_name (uids->data);
- text = g_markup_escape_text (name, -1);
- g_string_append (result, text);
- g_free (text);
- primary = name;
- }
-
- g_string_append (result, "<span size='small' rise='0'>");
- if (uids != NULL) {
- email = seahorse_pgp_uid_get_email (uids->data);
- if (email && !email[0])
- email = NULL;
- comment = seahorse_pgp_uid_get_comment (uids->data);
- if (comment && !comment[0])
- comment = NULL;
- text = g_markup_printf_escaped ("\n%s%s%s%s%s",
- email ? email : "",
- email ? " " : "",
- comment ? "'" : "",
- comment ? comment : "",
- comment ? "'" : "");
- g_string_append (result, text);
- g_free (text);
- uids = uids->next;
- }
-
- while (uids != NULL) {
- name = seahorse_pgp_uid_get_name (uids->data);
- if (name && !name[0])
- name = NULL;
- if (g_strcmp0 (name, primary) == 0)
- name = NULL;
- email = seahorse_pgp_uid_get_email (uids->data);
- if (email && !email[0])
- email = NULL;
- comment = seahorse_pgp_uid_get_comment (uids->data);
- if (comment && !comment[0])
- comment = NULL;
- text = g_markup_printf_escaped ("\n%s%s%s%s%s%s%s",
- name ? name : "",
- name ? ": " : "",
- email ? email : "",
- email ? " " : "",
- comment ? "'" : "",
- comment ? comment : "",
- comment ? "'" : "");
- g_string_append (result, text);
- g_free (text);
- uids = uids->next;
- }
-
- g_string_append (result, "</span></span>");
-
- return g_string_free (result, FALSE);
+ guint flags = seahorse_object_get_flags (SEAHORSE_OBJECT (self));
+ GList *uids;
+ GString *result;
+ gchar *text;
+ const gchar *name;
+ const gchar *email;
+ const gchar *comment;
+ const gchar *primary = NULL;
+
+ uids = seahorse_pgp_key_get_uids (self);
+
+ result = g_string_new ("<span");
+ if (flags & SEAHORSE_FLAG_EXPIRED || flags & SEAHORSE_FLAG_REVOKED ||
+ flags & SEAHORSE_FLAG_DISABLED)
+ g_string_append (result, " strikethrough='true'");
+ if (!(flags & SEAHORSE_FLAG_TRUSTED))
+ g_string_append (result, " foreground='#555555'");
+ g_string_append_c (result, '>');
+
+ /* The first name is the key name */
+ if (uids != NULL) {
+ name = seahorse_pgp_uid_get_name (uids->data);
+ text = g_markup_escape_text (name, -1);
+ g_string_append (result, text);
+ g_free (text);
+ primary = name;
+ }
+
+ g_string_append (result, "<span size='small' rise='0'>");
+ if (uids != NULL) {
+ email = seahorse_pgp_uid_get_email (uids->data);
+ if (email && !email[0])
+ email = NULL;
+ comment = seahorse_pgp_uid_get_comment (uids->data);
+ if (comment && !comment[0])
+ comment = NULL;
+ text = g_markup_printf_escaped ("\n%s%s%s%s%s",
+ email ? email : "",
+ email ? " " : "",
+ comment ? "'" : "",
+ comment ? comment : "",
+ comment ? "'" : "");
+ g_string_append (result, text);
+ g_free (text);
+ uids = uids->next;
+ }
+
+ while (uids != NULL) {
+ name = seahorse_pgp_uid_get_name (uids->data);
+ if (name && !name[0])
+ name = NULL;
+ if (g_strcmp0 (name, primary) == 0)
+ name = NULL;
+ email = seahorse_pgp_uid_get_email (uids->data);
+ if (email && !email[0])
+ email = NULL;
+ comment = seahorse_pgp_uid_get_comment (uids->data);
+ if (comment && !comment[0])
+ comment = NULL;
+ text = g_markup_printf_escaped ("\n%s%s%s%s%s%s%s",
+ name ? name : "",
+ name ? ": " : "",
+ email ? email : "",
+ email ? " " : "",
+ comment ? "'" : "",
+ comment ? comment : "",
+ comment ? "'" : "");
+ g_string_append (result, text);
+ g_free (text);
+ uids = uids->next;
+ }
+
+ g_string_append (result, "</span></span>");
+
+ return g_string_free (result, FALSE);
}
/* -----------------------------------------------------------------------------
- * OBJECT
+ * OBJECT
*/
static GList*
_seahorse_pgp_key_get_uids (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
- return self->pv->uids;
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
+
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
+ return priv->uids;
}
static void
_seahorse_pgp_key_set_uids (SeahorsePgpKey *self, GList *uids)
{
- g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
- seahorse_object_list_free (self->pv->uids);
- self->pv->uids = seahorse_object_list_copy (uids);
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
- g_object_notify (G_OBJECT (self), "uids");
+ seahorse_object_list_free (priv->uids);
+ priv->uids = seahorse_object_list_copy (uids);
+
+ g_object_notify (G_OBJECT (self), "uids");
}
static GList*
_seahorse_pgp_key_get_subkeys (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
- return self->pv->subkeys;
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
+
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
+ return priv->subkeys;
}
static void
_seahorse_pgp_key_set_subkeys (SeahorsePgpKey *self, GList *subkeys)
{
- const gchar *keyid = NULL;
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
+ const gchar *keyid = NULL;
- g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
- g_return_if_fail (subkeys);
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
+ g_return_if_fail (subkeys);
- keyid = seahorse_pgp_subkey_get_keyid (subkeys->data);
- g_return_if_fail (keyid);
+ keyid = seahorse_pgp_subkey_get_keyid (subkeys->data);
+ g_return_if_fail (keyid);
- /* The keyid can't change */
- if (self->pv->keyid) {
- if (g_strcmp0 (self->pv->keyid, keyid) != 0) {
- g_warning ("The keyid of a SeahorsePgpKey changed by "
- "setting a different subkey on it: %s != %s",
- self->pv->keyid, keyid);
- return;
- }
+ /* The keyid can't change */
+ if (priv->keyid) {
+ if (g_strcmp0 (priv->keyid, keyid) != 0) {
+ g_warning ("The keyid of a SeahorsePgpKey changed by "
+ "setting a different subkey on it: %s != %s",
+ priv->keyid, keyid);
+ return;
+ }
- } else {
- self->pv->keyid = g_strdup (keyid);
- }
+ } else {
+ priv->keyid = g_strdup (keyid);
+ }
- seahorse_object_list_free (self->pv->subkeys);
- self->pv->subkeys = seahorse_object_list_copy (subkeys);
+ seahorse_object_list_free (priv->subkeys);
+ priv->subkeys = seahorse_object_list_copy (subkeys);
- g_object_notify (G_OBJECT (self), "subkeys");
+ g_object_notify (G_OBJECT (self), "subkeys");
}
static GList*
_seahorse_pgp_key_get_photos (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
- return self->pv->photos;
-}
-
-static void
-_seahorse_pgp_key_set_photos (SeahorsePgpKey *self, GList *photos)
-{
- g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
-
- seahorse_object_list_free (self->pv->photos);
- self->pv->photos = seahorse_object_list_copy (photos);
-
- g_object_notify (G_OBJECT (self), "photos");
-}
-
-void
-seahorse_pgp_key_realize (SeahorsePgpKey *self)
-{
- const gchar *nickname, *keyid;
- const gchar *icon_name;
- gchar *markup, *name, *identifier;
- SeahorseUsage usage;
- GList *subkeys;
- GIcon *icon;
-
- subkeys = seahorse_pgp_key_get_subkeys (self);
- if (subkeys) {
- keyid = seahorse_pgp_subkey_get_keyid (subkeys->data);
- identifier = seahorse_pgp_key_calc_identifier (keyid);
- } else {
- identifier = g_strdup ("");
- }
-
- name = calc_name (self);
- markup = calc_markup (self);
- nickname = calc_short_name (self);
-
- g_object_get (self, "usage", &usage, NULL);
-
- /* The type */
- if (usage == SEAHORSE_USAGE_PRIVATE_KEY) {
- icon_name = GCR_ICON_KEY_PAIR;
- } else {
- icon_name = GCR_ICON_KEY;
- if (usage == SEAHORSE_USAGE_NONE)
- g_object_set (self, "usage", SEAHORSE_USAGE_PUBLIC_KEY, NULL);
- }
-
- icon = g_themed_icon_new (icon_name);
- g_object_set (self,
- "label", name,
- "markup", markup,
- "nickname", nickname,
- "identifier", identifier,
- "icon", icon,
- NULL);
-
- g_object_unref (icon);
- g_free (identifier);
- g_free (markup);
- g_free (name);
-}
-
-static void
-seahorse_pgp_key_init (SeahorsePgpKey *self)
-{
- self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PGP_TYPE_KEY, SeahorsePgpKeyPrivate);
-}
-
-static void
-seahorse_pgp_key_get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
- SeahorsePgpKey *self = SEAHORSE_PGP_KEY (object);
- SeahorseUsage usage;
-
- switch (prop_id) {
- case PROP_PHOTOS:
- g_value_set_boxed (value, seahorse_pgp_key_get_photos (self));
- break;
- case PROP_SUBKEYS:
- g_value_set_boxed (value, seahorse_pgp_key_get_subkeys (self));
- break;
- case PROP_UIDS:
- g_value_set_boxed (value, seahorse_pgp_key_get_uids (self));
- break;
- case PROP_FINGERPRINT:
- g_value_set_string (value, seahorse_pgp_key_get_fingerprint (self));
- break;
- case PROP_DESCRIPTION:
- g_object_get (self, "usage", &usage, NULL);
- if (usage == SEAHORSE_USAGE_PRIVATE_KEY)
- g_value_set_string (value, _("Personal PGP key"));
- else
- g_value_set_string (value, _("PGP key"));
- break;
- case PROP_EXPIRES:
- g_value_set_ulong (value, seahorse_pgp_key_get_expires (self));
- break;
- case PROP_LENGTH:
- g_value_set_uint (value, seahorse_pgp_key_get_length (self));
- break;
- case PROP_ALGO:
- g_value_set_string (value, seahorse_pgp_key_get_algo (self));
- break;
- case PROP_VALIDITY:
- g_value_set_uint (value, SEAHORSE_VALIDITY_UNKNOWN);
- break;
- case PROP_TRUST:
- g_value_set_uint (value, SEAHORSE_VALIDITY_UNKNOWN);
- break;
- }
-}
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
-static void
-seahorse_pgp_key_set_property (GObject *object, guint prop_id, const GValue *value,
- GParamSpec *pspec)
-{
- SeahorsePgpKey *self = SEAHORSE_PGP_KEY (object);
-
- switch (prop_id) {
- case PROP_UIDS:
- seahorse_pgp_key_set_uids (self, g_value_get_boxed (value));
- break;
- case PROP_SUBKEYS:
- seahorse_pgp_key_set_subkeys (self, g_value_get_boxed (value));
- break;
- case PROP_PHOTOS:
- seahorse_pgp_key_set_photos (self, g_value_get_boxed (value));
- break;
- }
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
+ return priv->photos;
}
static void
-seahorse_pgp_key_object_dispose (GObject *obj)
+_seahorse_pgp_key_set_photos (SeahorsePgpKey *self, GList *photos)
{
- SeahorsePgpKey *self = SEAHORSE_PGP_KEY (obj);
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
- seahorse_object_list_free (self->pv->uids);
- self->pv->uids = NULL;
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
- /* Free all the attached Photos */
- seahorse_object_list_free (self->pv->photos);
- self->pv->photos = NULL;
-
- /* Free all the attached Subkeys */
- seahorse_object_list_free (self->pv->subkeys);
- self->pv->subkeys = NULL;
+ seahorse_object_list_free (priv->photos);
+ priv->photos = seahorse_object_list_copy (photos);
- G_OBJECT_CLASS (seahorse_pgp_key_parent_class)->dispose (obj);
+ g_object_notify (G_OBJECT (self), "photos");
}
-static void
-seahorse_pgp_key_object_finalize (GObject *obj)
-{
- SeahorsePgpKey *self = SEAHORSE_PGP_KEY (obj);
-
- g_free (self->pv->keyid);
- g_assert (self->pv->uids == NULL);
- g_assert (self->pv->photos == NULL);
- g_assert (self->pv->subkeys == NULL);
-
- G_OBJECT_CLASS (seahorse_pgp_key_parent_class)->finalize (obj);
-}
-
-static void
-seahorse_pgp_key_class_init (SeahorsePgpKeyClass *klass)
+void
+seahorse_pgp_key_realize (SeahorsePgpKey *self)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (SeahorsePgpKeyPrivate));
-
- gobject_class->dispose = seahorse_pgp_key_object_dispose;
- gobject_class->finalize = seahorse_pgp_key_object_finalize;
- gobject_class->set_property = seahorse_pgp_key_set_property;
- gobject_class->get_property = seahorse_pgp_key_get_property;
-
- klass->get_uids = _seahorse_pgp_key_get_uids;
- klass->set_uids = _seahorse_pgp_key_set_uids;
- klass->get_subkeys = _seahorse_pgp_key_get_subkeys;
- klass->set_subkeys = _seahorse_pgp_key_set_subkeys;
- klass->get_photos = _seahorse_pgp_key_get_photos;
- klass->set_photos = _seahorse_pgp_key_set_photos;
-
- g_object_class_install_property (gobject_class, PROP_PHOTOS,
- g_param_spec_boxed ("photos", "Key Photos", "Photos for the key",
- SEAHORSE_BOXED_OBJECT_LIST, G_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class, PROP_SUBKEYS,
- g_param_spec_boxed ("subkeys", "PGP subkeys", "PGP subkeys",
- SEAHORSE_BOXED_OBJECT_LIST, G_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class, PROP_UIDS,
- g_param_spec_boxed ("uids", "PGP User Ids", "PGP User Ids",
- SEAHORSE_BOXED_OBJECT_LIST, G_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class, PROP_FINGERPRINT,
- g_param_spec_string ("fingerprint", "Fingerprint", "Unique fingerprint for this key",
- "", G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
- g_param_spec_string ("description", "Description", "Description for key",
- "", G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_VALIDITY,
- g_param_spec_uint ("validity", "Validity", "Validity of this key",
- 0, G_MAXUINT, 0, G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_TRUST,
- g_param_spec_uint ("trust", "Trust", "Trust in this key",
- 0, G_MAXUINT, 0, G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_EXPIRES,
- g_param_spec_ulong ("expires", "Expires On", "Date this key expires on",
- 0, G_MAXULONG, 0, G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_LENGTH,
- g_param_spec_uint ("length", "Length", "The length of this key.",
- 0, G_MAXUINT, 0, G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_ALGO,
- g_param_spec_string ("algo", "Algorithm", "The algorithm of this key.",
- "", G_PARAM_READABLE));
+ const gchar *nickname, *keyid;
+ const gchar *icon_name;
+ gchar *markup, *name, *identifier;
+ SeahorseUsage usage;
+ GList *subkeys;
+ GIcon *icon;
+
+ subkeys = seahorse_pgp_key_get_subkeys (self);
+ if (subkeys) {
+ keyid = seahorse_pgp_subkey_get_keyid (subkeys->data);
+ identifier = seahorse_pgp_key_calc_identifier (keyid);
+ } else {
+ identifier = g_strdup ("");
+ }
+
+ name = calc_name (self);
+ markup = calc_markup (self);
+ nickname = calc_short_name (self);
+
+ g_object_get (self, "usage", &usage, NULL);
+
+ /* The type */
+ if (usage == SEAHORSE_USAGE_PRIVATE_KEY) {
+ icon_name = GCR_ICON_KEY_PAIR;
+ } else {
+ icon_name = GCR_ICON_KEY;
+ if (usage == SEAHORSE_USAGE_NONE)
+ g_object_set (self, "usage", SEAHORSE_USAGE_PUBLIC_KEY, NULL);
+ }
+
+ icon = g_themed_icon_new (icon_name);
+ g_object_set (self,
+ "label", name,
+ "markup", markup,
+ "nickname", nickname,
+ "identifier", identifier,
+ "icon", icon,
+ NULL);
+
+ g_object_unref (icon);
+ g_free (identifier);
+ g_free (markup);
+ g_free (name);
}
static GtkWindow *
@@ -493,194 +339,357 @@ seahorse_pgp_key_create_viewer (SeahorseViewable *viewable,
static void
seahorse_pgp_key_viewable_iface (SeahorseViewableIface *iface)
{
- iface->create_viewer = seahorse_pgp_key_create_viewer;
+ iface->create_viewer = seahorse_pgp_key_create_viewer;
}
gchar*
seahorse_pgp_key_calc_identifier (const gchar *keyid)
{
- guint len;
-
- g_return_val_if_fail (keyid, NULL);
-
- len = strlen (keyid);
- if (len > 8)
- keyid += len - 8;
-
- return g_strdup (keyid);
-}
+ guint len;
-SeahorsePgpKey*
-seahorse_pgp_key_new (void)
-{
- return g_object_new (SEAHORSE_PGP_TYPE_KEY, NULL);
+ g_return_val_if_fail (keyid, NULL);
+
+ len = strlen (keyid);
+ if (len > 8)
+ keyid += len - 8;
+
+ return g_strdup (keyid);
}
GList*
seahorse_pgp_key_get_uids (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
- if (!SEAHORSE_PGP_KEY_GET_CLASS (self)->get_uids)
- return NULL;
- return SEAHORSE_PGP_KEY_GET_CLASS (self)->get_uids (self);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
+ if (!SEAHORSE_PGP_KEY_GET_CLASS (self)->get_uids)
+ return NULL;
+ return SEAHORSE_PGP_KEY_GET_CLASS (self)->get_uids (self);
}
void
seahorse_pgp_key_set_uids (SeahorsePgpKey *self, GList *uids)
{
- g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
- g_return_if_fail (SEAHORSE_PGP_KEY_GET_CLASS (self)->set_uids);
- SEAHORSE_PGP_KEY_GET_CLASS (self)->set_uids (self, uids);
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
+ g_return_if_fail (SEAHORSE_PGP_KEY_GET_CLASS (self)->set_uids);
+ SEAHORSE_PGP_KEY_GET_CLASS (self)->set_uids (self, uids);
}
GList*
seahorse_pgp_key_get_subkeys (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
- if (!SEAHORSE_PGP_KEY_GET_CLASS (self)->get_subkeys)
- return NULL;
- return SEAHORSE_PGP_KEY_GET_CLASS (self)->get_subkeys (self);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
+ if (!SEAHORSE_PGP_KEY_GET_CLASS (self)->get_subkeys)
+ return NULL;
+ return SEAHORSE_PGP_KEY_GET_CLASS (self)->get_subkeys (self);
}
void
seahorse_pgp_key_set_subkeys (SeahorsePgpKey *self, GList *subkeys)
{
- g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
- g_return_if_fail (SEAHORSE_PGP_KEY_GET_CLASS (self)->set_subkeys);
- SEAHORSE_PGP_KEY_GET_CLASS (self)->set_subkeys (self, subkeys);
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
+ g_return_if_fail (SEAHORSE_PGP_KEY_GET_CLASS (self)->set_subkeys);
+ SEAHORSE_PGP_KEY_GET_CLASS (self)->set_subkeys (self, subkeys);
}
GList*
seahorse_pgp_key_get_photos (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
- if (!SEAHORSE_PGP_KEY_GET_CLASS (self)->get_photos)
- return NULL;
- return SEAHORSE_PGP_KEY_GET_CLASS (self)->get_photos (self);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
+ if (!SEAHORSE_PGP_KEY_GET_CLASS (self)->get_photos)
+ return NULL;
+ return SEAHORSE_PGP_KEY_GET_CLASS (self)->get_photos (self);
}
void
seahorse_pgp_key_set_photos (SeahorsePgpKey *self, GList *photos)
{
- g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
- g_return_if_fail (SEAHORSE_PGP_KEY_GET_CLASS (self)->set_photos);
- SEAHORSE_PGP_KEY_GET_CLASS (self)->set_photos (self, photos);
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
+ g_return_if_fail (SEAHORSE_PGP_KEY_GET_CLASS (self)->set_photos);
+ SEAHORSE_PGP_KEY_GET_CLASS (self)->set_photos (self, photos);
}
const gchar*
seahorse_pgp_key_get_fingerprint (SeahorsePgpKey *self)
{
- GList *subkeys;
-
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
+ GList *subkeys;
+
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
- subkeys = seahorse_pgp_key_get_subkeys (self);
- if (!subkeys)
- return "";
-
- return seahorse_pgp_subkey_get_fingerprint (subkeys->data);
+ subkeys = seahorse_pgp_key_get_subkeys (self);
+ if (!subkeys)
+ return "";
+
+ return seahorse_pgp_subkey_get_fingerprint (subkeys->data);
}
SeahorseValidity
seahorse_pgp_key_get_validity (SeahorsePgpKey *self)
{
- guint validity = SEAHORSE_VALIDITY_UNKNOWN;
- g_object_get (self, "validity", &validity, NULL);
- return validity;
+ guint validity = SEAHORSE_VALIDITY_UNKNOWN;
+ g_object_get (self, "validity", &validity, NULL);
+ return validity;
}
gulong
seahorse_pgp_key_get_expires (SeahorsePgpKey *self)
{
- GList *subkeys;
-
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
+ GList *subkeys;
+
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
- subkeys = seahorse_pgp_key_get_subkeys (self);
- if (!subkeys)
- return 0;
-
- return seahorse_pgp_subkey_get_expires (subkeys->data);
+ subkeys = seahorse_pgp_key_get_subkeys (self);
+ if (!subkeys)
+ return 0;
+
+ return seahorse_pgp_subkey_get_expires (subkeys->data);
}
SeahorseValidity
seahorse_pgp_key_get_trust (SeahorsePgpKey *self)
{
- guint trust = SEAHORSE_VALIDITY_UNKNOWN;
- g_object_get (self, "trust", &trust, NULL);
- return trust;
+ guint trust = SEAHORSE_VALIDITY_UNKNOWN;
+ g_object_get (self, "trust", &trust, NULL);
+ return trust;
}
guint
seahorse_pgp_key_get_length (SeahorsePgpKey *self)
{
- GList *subkeys;
-
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
+ GList *subkeys;
+
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
- subkeys = seahorse_pgp_key_get_subkeys (self);
- if (!subkeys)
- return 0;
-
- return seahorse_pgp_subkey_get_length (subkeys->data);
+ subkeys = seahorse_pgp_key_get_subkeys (self);
+ if (!subkeys)
+ return 0;
+
+ return seahorse_pgp_subkey_get_length (subkeys->data);
}
const gchar*
seahorse_pgp_key_get_algo (SeahorsePgpKey *self)
{
- GList *subkeys;
-
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
+ GList *subkeys;
+
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
+
+ subkeys = seahorse_pgp_key_get_subkeys (self);
+ if (!subkeys)
+ return 0;
- subkeys = seahorse_pgp_key_get_subkeys (self);
- if (!subkeys)
- return 0;
-
- return seahorse_pgp_subkey_get_algorithm (subkeys->data);
+ return seahorse_pgp_subkey_get_algorithm (subkeys->data);
}
const gchar*
seahorse_pgp_key_get_keyid (SeahorsePgpKey *self)
{
- GList *subkeys;
-
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
+ GList *subkeys;
- subkeys = seahorse_pgp_key_get_subkeys (self);
- if (!subkeys)
- return 0;
-
- return seahorse_pgp_subkey_get_keyid (subkeys->data);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
+
+ subkeys = seahorse_pgp_key_get_subkeys (self);
+ if (!subkeys)
+ return 0;
+
+ return seahorse_pgp_subkey_get_keyid (subkeys->data);
}
gboolean
seahorse_pgp_key_has_keyid (SeahorsePgpKey *self, const gchar *match)
{
- GList *subkeys, *l;
- SeahorsePgpSubkey *subkey;
- const gchar *keyid;
- guint n_match, n_keyid;
-
- g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), FALSE);
- g_return_val_if_fail (match, FALSE);
-
- subkeys = seahorse_pgp_key_get_subkeys (self);
- if (!subkeys)
- return FALSE;
-
- n_match = strlen (match);
-
- for (l = subkeys; l && (subkey = SEAHORSE_PGP_SUBKEY (l->data)); l = g_list_next (l)) {
- keyid = seahorse_pgp_subkey_get_keyid (subkey);
- g_return_val_if_fail (keyid, FALSE);
- n_keyid = strlen (keyid);
- if (n_match <= n_keyid) {
- keyid += (n_keyid - n_match);
- if (strncmp (keyid, match, n_match) == 0)
- return TRUE;
- }
- }
-
- return FALSE;
+ GList *subkeys, *l;
+ SeahorsePgpSubkey *subkey;
+ const gchar *keyid;
+ guint n_match, n_keyid;
+
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), FALSE);
+ g_return_val_if_fail (match, FALSE);
+
+ subkeys = seahorse_pgp_key_get_subkeys (self);
+ if (!subkeys)
+ return FALSE;
+
+ n_match = strlen (match);
+
+ for (l = subkeys; l && (subkey = SEAHORSE_PGP_SUBKEY (l->data)); l = g_list_next (l)) {
+ keyid = seahorse_pgp_subkey_get_keyid (subkey);
+ g_return_val_if_fail (keyid, FALSE);
+ n_keyid = strlen (keyid);
+ if (n_match <= n_keyid) {
+ keyid += (n_keyid - n_match);
+ if (strncmp (keyid, match, n_match) == 0)
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+static void
+seahorse_pgp_key_init (SeahorsePgpKey *self)
+{
+}
+
+static void
+seahorse_pgp_key_get_property (GObject *object, guint prop_id,
+ GValue *value, GParamSpec *pspec)
+{
+ SeahorsePgpKey *self = SEAHORSE_PGP_KEY (object);
+ SeahorseUsage usage;
+
+ switch (prop_id) {
+ case PROP_PHOTOS:
+ g_value_set_boxed (value, seahorse_pgp_key_get_photos (self));
+ break;
+ case PROP_SUBKEYS:
+ g_value_set_boxed (value, seahorse_pgp_key_get_subkeys (self));
+ break;
+ case PROP_UIDS:
+ g_value_set_boxed (value, seahorse_pgp_key_get_uids (self));
+ break;
+ case PROP_FINGERPRINT:
+ g_value_set_string (value, seahorse_pgp_key_get_fingerprint (self));
+ break;
+ case PROP_DESCRIPTION:
+ g_object_get (self, "usage", &usage, NULL);
+ if (usage == SEAHORSE_USAGE_PRIVATE_KEY)
+ g_value_set_string (value, _("Personal PGP key"));
+ else
+ g_value_set_string (value, _("PGP key"));
+ break;
+ case PROP_EXPIRES:
+ g_value_set_ulong (value, seahorse_pgp_key_get_expires (self));
+ break;
+ case PROP_LENGTH:
+ g_value_set_uint (value, seahorse_pgp_key_get_length (self));
+ break;
+ case PROP_ALGO:
+ g_value_set_string (value, seahorse_pgp_key_get_algo (self));
+ break;
+ case PROP_VALIDITY:
+ g_value_set_uint (value, SEAHORSE_VALIDITY_UNKNOWN);
+ break;
+ case PROP_TRUST:
+ g_value_set_uint (value, SEAHORSE_VALIDITY_UNKNOWN);
+ break;
+ }
+}
+
+static void
+seahorse_pgp_key_set_property (GObject *object, guint prop_id, const GValue *value,
+ GParamSpec *pspec)
+{
+ SeahorsePgpKey *self = SEAHORSE_PGP_KEY (object);
+
+ switch (prop_id) {
+ case PROP_UIDS:
+ seahorse_pgp_key_set_uids (self, g_value_get_boxed (value));
+ break;
+ case PROP_SUBKEYS:
+ seahorse_pgp_key_set_subkeys (self, g_value_get_boxed (value));
+ break;
+ case PROP_PHOTOS:
+ seahorse_pgp_key_set_photos (self, g_value_get_boxed (value));
+ break;
+ }
+}
+
+static void
+seahorse_pgp_key_object_dispose (GObject *obj)
+{
+ SeahorsePgpKey *self = SEAHORSE_PGP_KEY (obj);
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
+
+ g_clear_pointer (&priv->uids, seahorse_object_list_free);
+ g_clear_pointer (&priv->photos, seahorse_object_list_free);
+ g_clear_pointer (&priv->subkeys, seahorse_object_list_free);
+
+ G_OBJECT_CLASS (seahorse_pgp_key_parent_class)->dispose (obj);
}
+static void
+seahorse_pgp_key_object_finalize (GObject *obj)
+{
+ SeahorsePgpKey *self = SEAHORSE_PGP_KEY (obj);
+ SeahorsePgpKeyPrivate *priv = seahorse_pgp_key_get_instance_private (self);
+
+ g_free (priv->keyid);
+ g_assert (priv->uids == NULL);
+ g_assert (priv->photos == NULL);
+ g_assert (priv->subkeys == NULL);
+
+ G_OBJECT_CLASS (seahorse_pgp_key_parent_class)->finalize (obj);
+}
+
+static void
+seahorse_pgp_key_class_init (SeahorsePgpKeyClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ gobject_class->dispose = seahorse_pgp_key_object_dispose;
+ gobject_class->finalize = seahorse_pgp_key_object_finalize;
+ gobject_class->set_property = seahorse_pgp_key_set_property;
+ gobject_class->get_property = seahorse_pgp_key_get_property;
+
+ klass->get_uids = _seahorse_pgp_key_get_uids;
+ klass->set_uids = _seahorse_pgp_key_set_uids;
+ klass->get_subkeys = _seahorse_pgp_key_get_subkeys;
+ klass->set_subkeys = _seahorse_pgp_key_set_subkeys;
+ klass->get_photos = _seahorse_pgp_key_get_photos;
+ klass->set_photos = _seahorse_pgp_key_set_photos;
+
+ g_object_class_install_property (gobject_class, PROP_PHOTOS,
+ g_param_spec_boxed ("photos", "Key Photos", "Photos for the key",
+ SEAHORSE_BOXED_OBJECT_LIST,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_SUBKEYS,
+ g_param_spec_boxed ("subkeys", "PGP subkeys", "PGP subkeys",
+ SEAHORSE_BOXED_OBJECT_LIST,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_UIDS,
+ g_param_spec_boxed ("uids", "PGP User Ids", "PGP User Ids",
+ SEAHORSE_BOXED_OBJECT_LIST,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_FINGERPRINT,
+ g_param_spec_string ("fingerprint", "Fingerprint", "Unique fingerprint for this key",
+ "",
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
+ g_param_spec_string ("description", "Description", "Description for key",
+ "",
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_VALIDITY,
+ g_param_spec_uint ("validity", "Validity", "Validity of this key",
+ 0, G_MAXUINT, 0,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_TRUST,
+ g_param_spec_uint ("trust", "Trust", "Trust in this key",
+ 0, G_MAXUINT, 0,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_EXPIRES,
+ g_param_spec_ulong ("expires", "Expires On", "Date this key expires on",
+ 0, G_MAXULONG, 0,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_LENGTH,
+ g_param_spec_uint ("length", "Length", "The length of this key.",
+ 0, G_MAXUINT, 0,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_ALGO,
+ g_param_spec_string ("algo", "Algorithm", "The algorithm of this key.",
+ "",
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+}
+
+SeahorsePgpKey*
+seahorse_pgp_key_new (void)
+{
+ return g_object_new (SEAHORSE_PGP_TYPE_KEY, NULL);
+}
diff --git a/pgp/seahorse-pgp-key.h b/pgp/seahorse-pgp-key.h
index 87f5bd31..3baa35fd 100644
--- a/pgp/seahorse-pgp-key.h
+++ b/pgp/seahorse-pgp-key.h
@@ -38,27 +38,27 @@ enum {
typedef struct _SeahorsePgpKey SeahorsePgpKey;
typedef struct _SeahorsePgpKeyClass SeahorsePgpKeyClass;
-typedef struct _SeahorsePgpKeyPrivate SeahorsePgpKeyPrivate;
struct _SeahorsePgpKey {
- SeahorseObject parent;
- SeahorsePgpKeyPrivate *pv;
+ SeahorseObject parent;
};
struct _SeahorsePgpKeyClass {
- SeahorseObjectClass parent_class;
-
- /* virtual methods */
- GList* (*get_uids) (SeahorsePgpKey *self);
- void (*set_uids) (SeahorsePgpKey *self, GList *uids);
-
- GList* (*get_subkeys) (SeahorsePgpKey *self);
- void (*set_subkeys) (SeahorsePgpKey *self, GList *uids);
-
- GList* (*get_photos) (SeahorsePgpKey *self);
- void (*set_photos) (SeahorsePgpKey *self, GList *uids);
+ SeahorseObjectClass parent_class;
+
+ /* virtual methods */
+ GList* (*get_uids) (SeahorsePgpKey *self);
+ void (*set_uids) (SeahorsePgpKey *self, GList *uids);
+
+ GList* (*get_subkeys) (SeahorsePgpKey *self);
+ void (*set_subkeys) (SeahorsePgpKey *self, GList *uids);
+
+ GList* (*get_photos) (SeahorsePgpKey *self);
+ void (*set_photos) (SeahorsePgpKey *self, GList *uids);
};
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (SeahorsePgpKey, g_object_unref)
+
GType seahorse_pgp_key_get_type (void);
SeahorsePgpKey * seahorse_pgp_key_new (void);
@@ -94,7 +94,7 @@ const gchar* seahorse_pgp_key_get_algo (SeahorsePgpKey *self);
const gchar* seahorse_pgp_key_get_keyid (SeahorsePgpKey *self);
-gboolean seahorse_pgp_key_has_keyid (SeahorsePgpKey *self,
+gboolean seahorse_pgp_key_has_keyid (SeahorsePgpKey *self,
const gchar *keyid);
gchar* seahorse_pgp_key_calc_identifier (const gchar *keyid);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
