[seahorse/wip/nielsdg/fix-pgp-namespace] pgp: fix the pgp namespace
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/wip/nielsdg/fix-pgp-namespace] pgp: fix the pgp namespace
- Date: Sun, 30 Dec 2018 10:11:20 +0000 (UTC)
commit 7fed9aeb7ee6371fe9af93208d0b090d4cd89ccd
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sun Dec 30 11:08:05 2018 +0100
pgp: fix the pgp namespace
In the rest of the codebase, we assume that each module provides its own
namespace under the general `Seahorse` namespace (for example,
`Seahorse.Ssh`). In the Pgp module however, objects were directly under
the Seahorse namespace (`Seahorse.PgpBackend` vs `Seahorse.Pgp.Backend`)
which gave issues once we tried to let the Vala code and the C code
cooperate.
pgp/seahorse-combo-keys.c | 2 +-
pgp/seahorse-gpgme-key.c | 2 +-
pgp/seahorse-gpgme-photo.c | 2 +-
pgp/seahorse-gpgme-subkey.c | 2 +-
pgp/seahorse-gpgme-uid.c | 2 +-
pgp/seahorse-pgp-actions.c | 26 ++++++++++++------------
pgp/seahorse-pgp-backend.c | 30 ++++++++++++++--------------
pgp/seahorse-pgp-backend.h | 12 +++++------
pgp/seahorse-pgp-key-properties.c | 12 +++++------
pgp/seahorse-pgp-key.c | 40 ++++++++++++++++++-------------------
pgp/seahorse-pgp-key.h | 12 +++++------
pgp/seahorse-pgp-photo.c | 8 ++++----
pgp/seahorse-pgp-photo.h | 12 +++++------
pgp/seahorse-pgp-signature.c | 14 ++++++-------
pgp/seahorse-pgp-signature.h | 12 +++++------
pgp/seahorse-pgp-subkey.c | 42 +++++++++++++++++++--------------------
pgp/seahorse-pgp-subkey.h | 12 +++++------
pgp/seahorse-pgp-uid.c | 28 +++++++++++++-------------
pgp/seahorse-pgp-uid.h | 12 +++++------
19 files changed, 141 insertions(+), 141 deletions(-)
---
diff --git a/pgp/seahorse-combo-keys.c b/pgp/seahorse-combo-keys.c
index da50e82b..a3b9b272 100644
--- a/pgp/seahorse-combo-keys.c
+++ b/pgp/seahorse-combo-keys.c
@@ -90,7 +90,7 @@ calculate_markup_for_object (GtkComboBox *combo,
}
}
- if (closure->collision && SEAHORSE_IS_PGP_KEY (object)) {
+ if (closure->collision && SEAHORSE_PGP_IS_KEY (object)) {
keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (object));
ident = seahorse_pgp_key_calc_identifier (keyid);
markup = g_markup_printf_escaped ("%s <span size='small'>[%s]</span>", label, ident);
diff --git a/pgp/seahorse-gpgme-key.c b/pgp/seahorse-gpgme-key.c
index aac8b44d..ac52c2a9 100644
--- a/pgp/seahorse-gpgme-key.c
+++ b/pgp/seahorse-gpgme-key.c
@@ -52,7 +52,7 @@ static void seahorse_gpgme_key_deletable_iface (SeahorseDeletableIfa
static void seahorse_gpgme_key_exportable_iface (SeahorseExportableIface *iface);
-G_DEFINE_TYPE_WITH_CODE (SeahorseGpgmeKey, seahorse_gpgme_key, SEAHORSE_TYPE_PGP_KEY,
+G_DEFINE_TYPE_WITH_CODE (SeahorseGpgmeKey, seahorse_gpgme_key, SEAHORSE_PGP_TYPE_KEY,
G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTABLE,
seahorse_gpgme_key_exportable_iface);
G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_DELETABLE, seahorse_gpgme_key_deletable_iface);
);
diff --git a/pgp/seahorse-gpgme-photo.c b/pgp/seahorse-gpgme-photo.c
index 52c7e114..b8d70d1f 100644
--- a/pgp/seahorse-gpgme-photo.c
+++ b/pgp/seahorse-gpgme-photo.c
@@ -32,7 +32,7 @@ enum {
PROP_INDEX
};
-G_DEFINE_TYPE (SeahorseGpgmePhoto, seahorse_gpgme_photo, SEAHORSE_TYPE_PGP_PHOTO);
+G_DEFINE_TYPE (SeahorseGpgmePhoto, seahorse_gpgme_photo, SEAHORSE_PGP_TYPE_PHOTO);
struct _SeahorseGpgmePhotoPrivate {
gpgme_key_t pubkey; /* Key that this photo is on */
diff --git a/pgp/seahorse-gpgme-subkey.c b/pgp/seahorse-gpgme-subkey.c
index 00f115ab..1115a031 100644
--- a/pgp/seahorse-gpgme-subkey.c
+++ b/pgp/seahorse-gpgme-subkey.c
@@ -33,7 +33,7 @@ enum {
PROP_SUBKEY
};
-G_DEFINE_TYPE (SeahorseGpgmeSubkey, seahorse_gpgme_subkey, SEAHORSE_TYPE_PGP_SUBKEY);
+G_DEFINE_TYPE (SeahorseGpgmeSubkey, seahorse_gpgme_subkey, SEAHORSE_PGP_TYPE_SUBKEY);
struct _SeahorseGpgmeSubkeyPrivate {
gpgme_key_t pubkey; /* The public key that this subkey is part of */
diff --git a/pgp/seahorse-gpgme-uid.c b/pgp/seahorse-gpgme-uid.c
index d34895e7..71ebdee1 100644
--- a/pgp/seahorse-gpgme-uid.c
+++ b/pgp/seahorse-gpgme-uid.c
@@ -38,7 +38,7 @@ enum {
PROP_ACTUAL_INDEX
};
-G_DEFINE_TYPE (SeahorseGpgmeUid, seahorse_gpgme_uid, SEAHORSE_TYPE_PGP_UID);
+G_DEFINE_TYPE (SeahorseGpgmeUid, seahorse_gpgme_uid, SEAHORSE_PGP_TYPE_UID);
struct _SeahorseGpgmeUidPrivate {
gpgme_key_t pubkey; /* The public key that this uid is part of */
diff --git a/pgp/seahorse-pgp-actions.c b/pgp/seahorse-pgp-actions.c
index 7ae80ca8..3bffb92d 100644
--- a/pgp/seahorse-pgp-actions.c
+++ b/pgp/seahorse-pgp-actions.c
@@ -39,12 +39,12 @@
#include "libseahorse/seahorse-util.h"
GType seahorse_pgp_backend_actions_get_type (void) G_GNUC_CONST;
-#define SEAHORSE_TYPE_PGP_BACKEND_ACTIONS (seahorse_pgp_backend_actions_get_type ())
-#define SEAHORSE_PGP_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
SEAHORSE_TYPE_PGP_BACKEND_ACTIONS, SeahorsePgpBackendActions))
-#define SEAHORSE_PGP_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
SEAHORSE_TYPE_PGP_BACKEND_ACTIONS, SeahorsePgpBackendActionsClass))
-#define SEAHORSE_IS_PGP_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
SEAHORSE_TYPE_PGP_BACKEND_ACTIONS))
-#define SEAHORSE_IS_PGP_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
SEAHORSE_TYPE_PGP_BACKEND_ACTIONS))
-#define SEAHORSE_PGP_BACKEND_ACTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
SEAHORSE_TYPE_PGP_BACKEND_ACTIONS, SeahorsePgpBackendActionsClass))
+#define SEAHORSE_PGP_TYPE_BACKEND_ACTIONS (seahorse_pgp_backend_actions_get_type ())
+#define SEAHORSE_PGP_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
SEAHORSE_PGP_TYPE_BACKEND_ACTIONS, SeahorsePgpBackendActions))
+#define SEAHORSE_PGP_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
SEAHORSE_PGP_TYPE_BACKEND_ACTIONS, SeahorsePgpBackendActionsClass))
+#define SEAHORSE_PGP_IS_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
SEAHORSE_PGP_TYPE_BACKEND_ACTIONS))
+#define SEAHORSE_PGP_IS_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
SEAHORSE_PGP_TYPE_BACKEND_ACTIONS))
+#define SEAHORSE_PGP_BACKEND_ACTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
SEAHORSE_PGP_TYPE_BACKEND_ACTIONS, SeahorsePgpBackendActionsClass))
typedef struct {
SeahorseActions parent_instance;
@@ -92,7 +92,7 @@ on_remote_sync (GtkAction* action,
if (catalog != NULL) {
objects = seahorse_catalog_get_selected_objects (catalog);
for (l = objects; l != NULL; l = g_list_next (l)) {
- if (SEAHORSE_IS_PGP_KEY (l->data))
+ if (SEAHORSE_PGP_IS_KEY (l->data))
keys = g_list_prepend (keys, l->data);
}
g_list_free (objects);
@@ -146,7 +146,7 @@ seahorse_pgp_backend_actions_instance (void)
static GtkActionGroup *actions = NULL;
if (actions == NULL) {
- actions = g_object_new (SEAHORSE_TYPE_PGP_BACKEND_ACTIONS,
+ actions = g_object_new (SEAHORSE_PGP_TYPE_BACKEND_ACTIONS,
"name", "pgp-backend",
NULL);
g_object_add_weak_pointer (G_OBJECT (actions),
@@ -160,11 +160,11 @@ seahorse_pgp_backend_actions_instance (void)
GType seahorse_gpgme_key_actions_get_type (void) G_GNUC_CONST;
#define SEAHORSE_TYPE_GPGME_KEY_ACTIONS (seahorse_gpgme_key_actions_get_type ())
-#define seahorse_gpgme_key_actions(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
SEAHORSE_TYPE_PGP_ACTIONS, SeahorseGpgmeKeyActions))
-#define seahorse_gpgme_key_actions_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
SEAHORSE_TYPE_PGP_ACTIONS, SeahorseGpgmeKeyActionsClass))
-#define SEAHORSE_IS_PGP_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
SEAHORSE_TYPE_PGP_ACTIONS))
-#define SEAHORSE_IS_PGP_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
SEAHORSE_TYPE_PGP_ACTIONS))
-#define seahorse_gpgme_key_actions_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
SEAHORSE_TYPE_PGP_ACTIONS, SeahorseGpgmeKeyActionsClass))
+#define seahorse_gpgme_key_actions(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
SEAHORSE_PGP_TYPE_ACTIONS, SeahorseGpgmeKeyActions))
+#define seahorse_gpgme_key_actions_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
SEAHORSE_PGP_TYPE_ACTIONS, SeahorseGpgmeKeyActionsClass))
+#define SEAHORSE_PGP_IS_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
SEAHORSE_PGP_TYPE_ACTIONS))
+#define SEAHORSE_PGP_IS_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
SEAHORSE_PGP_TYPE_ACTIONS))
+#define seahorse_gpgme_key_actions_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
SEAHORSE_PGP_TYPE_ACTIONS, SeahorseGpgmeKeyActionsClass))
typedef struct {
SeahorseActions parent_instance;
diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
index 9b9dbf93..05a90616 100644
--- a/pgp/seahorse-pgp-backend.c
+++ b/pgp/seahorse-pgp-backend.c
@@ -208,7 +208,7 @@ seahorse_pgp_backend_get_actions (SeahorseBackend *backend)
static gboolean
seahorse_pgp_backend_get_loaded (SeahorseBackend *backend)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (backend), FALSE);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (backend), FALSE);
return SEAHORSE_PGP_BACKEND (backend)->loaded;
}
@@ -342,7 +342,7 @@ seahorse_pgp_backend_initialize (void)
SeahorsePgpBackend *self;
g_return_if_fail (pgp_backend == NULL);
- self = g_object_new (SEAHORSE_TYPE_PGP_BACKEND, NULL);
+ self = g_object_new (SEAHORSE_PGP_TYPE_BACKEND, NULL);
seahorse_backend_register (SEAHORSE_BACKEND (self));
g_object_unref (self);
@@ -356,7 +356,7 @@ SeahorseGpgmeKeyring *
seahorse_pgp_backend_get_default_keyring (SeahorsePgpBackend *self)
{
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), NULL);
g_return_val_if_fail (self->keyring, NULL);
return self->keyring;
}
@@ -370,7 +370,7 @@ seahorse_pgp_backend_get_default_key (SeahorsePgpBackend *self)
gchar *value;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), NULL);
settings = seahorse_pgp_settings_instance ();
if (settings != NULL) {
@@ -394,7 +394,7 @@ SeahorseDiscovery *
seahorse_pgp_backend_get_discovery (SeahorsePgpBackend *self)
{
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), NULL);
g_return_val_if_fail (self->discovery, NULL);
return self->discovery;
}
@@ -404,7 +404,7 @@ seahorse_pgp_backend_lookup_remote (SeahorsePgpBackend *self,
const gchar *uri)
{
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), NULL);
return g_hash_table_lookup (self->remotes, uri);
}
@@ -415,7 +415,7 @@ seahorse_pgp_backend_add_remote (SeahorsePgpBackend *self,
SeahorseServerSource *source)
{
self = self ? self : seahorse_pgp_backend_get ();
- g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_BACKEND (self));
g_return_if_fail (uri != NULL);
g_return_if_fail (SEAHORSE_IS_SERVER_SOURCE (source));
g_return_if_fail (g_hash_table_lookup (self->remotes, uri) == NULL);
@@ -428,7 +428,7 @@ seahorse_pgp_backend_remove_remote (SeahorsePgpBackend *self,
const gchar *uri)
{
self = self ? self : seahorse_pgp_backend_get ();
- g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_BACKEND (self));
g_return_if_fail (uri != NULL);
g_hash_table_remove (self->remotes, uri);
@@ -491,7 +491,7 @@ seahorse_pgp_backend_search_remote_async (SeahorsePgpBackend *self,
guint i;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_BACKEND (self));
/* Get a list of all selected key servers */
names = g_settings_get_strv (G_SETTINGS (seahorse_app_settings_instance ()), "last-search-servers");
@@ -544,7 +544,7 @@ seahorse_pgp_backend_search_remote_finish (SeahorsePgpBackend *self,
GSimpleAsyncResult *res;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), FALSE);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), FALSE);
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self),
seahorse_pgp_backend_search_remote_async), FALSE);
@@ -609,7 +609,7 @@ seahorse_pgp_backend_transfer_async (SeahorsePgpBackend *self,
GList *next;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_BACKEND (self));
g_return_if_fail (SEAHORSE_IS_PLACE (to));
res = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
@@ -663,7 +663,7 @@ seahorse_pgp_backend_transfer_finish (SeahorsePgpBackend *self,
GSimpleAsyncResult *res;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), FALSE);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), FALSE);
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self),
seahorse_pgp_backend_transfer_async), FALSE);
@@ -689,7 +689,7 @@ seahorse_pgp_backend_retrieve_async (SeahorsePgpBackend *self,
GHashTableIter iter;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_BACKEND (self));
g_return_if_fail (SEAHORSE_IS_PLACE (to));
res = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
@@ -723,7 +723,7 @@ seahorse_pgp_backend_retrieve_finish (SeahorsePgpBackend *self,
GSimpleAsyncResult *res;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), FALSE);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), FALSE);
g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self),
seahorse_pgp_backend_retrieve_async), FALSE);
@@ -750,7 +750,7 @@ seahorse_pgp_backend_discover_keys (SeahorsePgpBackend *self,
gint i;
self = self ? self : seahorse_pgp_backend_get ();
- g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_BACKEND (self), NULL);
todiscover = g_ptr_array_new ();
diff --git a/pgp/seahorse-pgp-backend.h b/pgp/seahorse-pgp-backend.h
index 20ad89a0..f1db82cd 100644
--- a/pgp/seahorse-pgp-backend.h
+++ b/pgp/seahorse-pgp-backend.h
@@ -41,12 +41,12 @@ G_BEGIN_DECLS
void seahorse_pgp_backend_initialize (void);
-#define SEAHORSE_TYPE_PGP_BACKEND (seahorse_pgp_backend_get_type ())
-#define SEAHORSE_PGP_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_BACKEND,
SeahorsePgpBackend))
-#define SEAHORSE_PGP_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_BACKEND,
SeahorsePgpBackendClass))
-#define SEAHORSE_IS_PGP_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_BACKEND))
-#define SEAHORSE_IS_PGP_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_BACKEND))
-#define SEAHORSE_PGP_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_BACKEND,
SeahorsePgpBackendClass))
+#define SEAHORSE_PGP_TYPE_BACKEND (seahorse_pgp_backend_get_type ())
+#define SEAHORSE_PGP_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PGP_TYPE_BACKEND,
SeahorsePgpBackend))
+#define SEAHORSE_PGP_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PGP_TYPE_BACKEND,
SeahorsePgpBackendClass))
+#define SEAHORSE_PGP_IS_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PGP_TYPE_BACKEND))
+#define SEAHORSE_PGP_IS_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PGP_TYPE_BACKEND))
+#define SEAHORSE_PGP_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PGP_TYPE_BACKEND,
SeahorsePgpBackendClass))
typedef struct _SeahorsePgpBackend SeahorsePgpBackend;
typedef struct _SeahorsePgpBackendClass SeahorsePgpBackendClass;
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index c5cd66d1..31331cd2 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -240,7 +240,7 @@ on_pgp_signature_row_activated (GtkTreeView *treeview,
g_return_if_fail (gtk_tree_model_get_iter (model, &iter, path));
object = seahorse_object_model_get_row_key (SEAHORSE_OBJECT_MODEL (model), &iter);
- if (object != NULL && SEAHORSE_IS_PGP_KEY (object)) {
+ if (object != NULL && SEAHORSE_PGP_IS_KEY (object)) {
seahorse_pgp_key_properties_show (SEAHORSE_PGP_KEY (object),
GTK_WINDOW (gtk_widget_get_parent
(seahorse_widget_get_toplevel (swidget))));
}
@@ -404,7 +404,7 @@ names_update_row (SeahorseObjectModel *skmodel, SeahorseObject *object,
GIcon *icon;
const gchar *name, *id;
- icon = g_themed_icon_new (SEAHORSE_IS_PGP_KEY (object) ?
+ icon = g_themed_icon_new (SEAHORSE_PGP_IS_KEY (object) ?
SEAHORSE_ICON_SIGN : GTK_STOCK_DIALOG_QUESTION);
name = seahorse_object_get_markup (object);
id = seahorse_object_get_identifier (object);
@@ -679,7 +679,7 @@ set_photoid_state (SeahorseWidget *swidget, SeahorsePgpKey *pkey)
photos = seahorse_pgp_key_get_photos (pkey);
photo = g_object_get_data (G_OBJECT (swidget), "current-photoid");
- g_return_if_fail (!photo || SEAHORSE_IS_PGP_PHOTO (photo));
+ g_return_if_fail (!photo || SEAHORSE_PGP_IS_PHOTO (photo));
is_gpgme = SEAHORSE_IS_GPGME_KEY (pkey);
/* Show when adding a photo is possible */
@@ -753,7 +753,7 @@ on_pgp_owner_photoid_next (GtkWidget *widget,
photo = g_object_get_data (G_OBJECT (swidget), "current-photoid");
if (photo) {
- g_return_if_fail (SEAHORSE_IS_PGP_PHOTO (photo));
+ g_return_if_fail (SEAHORSE_PGP_IS_PHOTO (photo));
photos = g_list_find (photos, photo);
if(photos && photos->next)
g_object_set_data_full (G_OBJECT (swidget), "current-photoid",
@@ -778,7 +778,7 @@ on_pgp_owner_photoid_prev (GtkWidget *widget,
photo = g_object_get_data (G_OBJECT (swidget), "current-photoid");
if (photo) {
- g_return_if_fail (SEAHORSE_IS_PGP_PHOTO (photo));
+ g_return_if_fail (SEAHORSE_PGP_IS_PHOTO (photo));
photos = g_list_find (photos, photo);
if(photos && photos->prev)
g_object_set_data_full (G_OBJECT (swidget), "current-photoid",
@@ -1560,7 +1560,7 @@ trust_update_row (SeahorseObjectModel *skmodel, SeahorseObject *object,
else if (seahorse_object_get_flags (object) & SEAHORSE_FLAG_TRUSTED)
trusted = TRUE;
- icon = g_themed_icon_new (SEAHORSE_IS_PGP_KEY (object) ?
+ icon = g_themed_icon_new (SEAHORSE_PGP_IS_KEY (object) ?
SEAHORSE_ICON_SIGN : GTK_STOCK_DIALOG_QUESTION);
name = seahorse_object_get_label (object);
id = seahorse_object_get_identifier (object);
diff --git a/pgp/seahorse-pgp-key.c b/pgp/seahorse-pgp-key.c
index 0f953c2b..b66dc9db 100644
--- a/pgp/seahorse-pgp-key.c
+++ b/pgp/seahorse-pgp-key.c
@@ -198,14 +198,14 @@ calc_markup (SeahorsePgpKey *self)
static GList*
_seahorse_pgp_key_get_uids (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
return self->pv->uids;
}
static void
_seahorse_pgp_key_set_uids (SeahorsePgpKey *self, GList *uids)
{
- g_return_if_fail (SEAHORSE_IS_PGP_KEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
seahorse_object_list_free (self->pv->uids);
self->pv->uids = seahorse_object_list_copy (uids);
@@ -216,7 +216,7 @@ _seahorse_pgp_key_set_uids (SeahorsePgpKey *self, GList *uids)
static GList*
_seahorse_pgp_key_get_subkeys (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
return self->pv->subkeys;
}
@@ -225,7 +225,7 @@ _seahorse_pgp_key_set_subkeys (SeahorsePgpKey *self, GList *subkeys)
{
const gchar *keyid = NULL;
- g_return_if_fail (SEAHORSE_IS_PGP_KEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
g_return_if_fail (subkeys);
keyid = seahorse_pgp_subkey_get_keyid (subkeys->data);
@@ -253,14 +253,14 @@ _seahorse_pgp_key_set_subkeys (SeahorsePgpKey *self, GList *subkeys)
static GList*
_seahorse_pgp_key_get_photos (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL);
+ 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_IS_PGP_KEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_KEY (self));
seahorse_object_list_free (self->pv->photos);
self->pv->photos = seahorse_object_list_copy (photos);
@@ -319,7 +319,7 @@ seahorse_pgp_key_realize (SeahorsePgpKey *self)
static void
seahorse_pgp_key_init (SeahorsePgpKey *self)
{
- self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PGP_KEY, SeahorsePgpKeyPrivate);
+ self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PGP_TYPE_KEY, SeahorsePgpKeyPrivate);
}
static void
@@ -508,13 +508,13 @@ seahorse_pgp_key_calc_identifier (const gchar *keyid)
SeahorsePgpKey*
seahorse_pgp_key_new (void)
{
- return g_object_new (SEAHORSE_TYPE_PGP_KEY, NULL);
+ return g_object_new (SEAHORSE_PGP_TYPE_KEY, NULL);
}
GList*
seahorse_pgp_key_get_uids (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL);
+ 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);
@@ -523,7 +523,7 @@ seahorse_pgp_key_get_uids (SeahorsePgpKey *self)
void
seahorse_pgp_key_set_uids (SeahorsePgpKey *self, GList *uids)
{
- g_return_if_fail (SEAHORSE_IS_PGP_KEY (self));
+ 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);
}
@@ -531,7 +531,7 @@ seahorse_pgp_key_set_uids (SeahorsePgpKey *self, GList *uids)
GList*
seahorse_pgp_key_get_subkeys (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL);
+ 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);
@@ -540,7 +540,7 @@ seahorse_pgp_key_get_subkeys (SeahorsePgpKey *self)
void
seahorse_pgp_key_set_subkeys (SeahorsePgpKey *self, GList *subkeys)
{
- g_return_if_fail (SEAHORSE_IS_PGP_KEY (self));
+ 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);
}
@@ -548,7 +548,7 @@ seahorse_pgp_key_set_subkeys (SeahorsePgpKey *self, GList *subkeys)
GList*
seahorse_pgp_key_get_photos (SeahorsePgpKey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL);
+ 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);
@@ -557,7 +557,7 @@ seahorse_pgp_key_get_photos (SeahorsePgpKey *self)
void
seahorse_pgp_key_set_photos (SeahorsePgpKey *self, GList *photos)
{
- g_return_if_fail (SEAHORSE_IS_PGP_KEY (self));
+ 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);
}
@@ -567,7 +567,7 @@ seahorse_pgp_key_get_fingerprint (SeahorsePgpKey *self)
{
GList *subkeys;
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), NULL);
subkeys = seahorse_pgp_key_get_subkeys (self);
if (!subkeys)
@@ -589,7 +589,7 @@ seahorse_pgp_key_get_expires (SeahorsePgpKey *self)
{
GList *subkeys;
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
subkeys = seahorse_pgp_key_get_subkeys (self);
if (!subkeys)
@@ -611,7 +611,7 @@ seahorse_pgp_key_get_length (SeahorsePgpKey *self)
{
GList *subkeys;
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
subkeys = seahorse_pgp_key_get_subkeys (self);
if (!subkeys)
@@ -625,7 +625,7 @@ seahorse_pgp_key_get_algo (SeahorsePgpKey *self)
{
GList *subkeys;
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
subkeys = seahorse_pgp_key_get_subkeys (self);
if (!subkeys)
@@ -639,7 +639,7 @@ seahorse_pgp_key_get_keyid (SeahorsePgpKey *self)
{
GList *subkeys;
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_KEY (self), 0);
subkeys = seahorse_pgp_key_get_subkeys (self);
if (!subkeys)
@@ -656,7 +656,7 @@ seahorse_pgp_key_has_keyid (SeahorsePgpKey *self, const gchar *match)
const gchar *keyid;
guint n_match, n_keyid;
- g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), FALSE);
+ 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);
diff --git a/pgp/seahorse-pgp-key.h b/pgp/seahorse-pgp-key.h
index adbf4802..1f17825d 100644
--- a/pgp/seahorse-pgp-key.h
+++ b/pgp/seahorse-pgp-key.h
@@ -29,12 +29,12 @@ enum {
SKEY_PGPSIG_PERSONAL = 0x0002
};
-#define SEAHORSE_TYPE_PGP_KEY (seahorse_pgp_key_get_type ())
-#define SEAHORSE_PGP_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_KEY,
SeahorsePgpKey))
-#define SEAHORSE_PGP_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_KEY,
SeahorsePgpKeyClass))
-#define SEAHORSE_IS_PGP_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_KEY))
-#define SEAHORSE_IS_PGP_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_KEY))
-#define SEAHORSE_PGP_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_KEY,
SeahorsePgpKeyClass))
+#define SEAHORSE_PGP_TYPE_KEY (seahorse_pgp_key_get_type ())
+#define SEAHORSE_PGP_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PGP_TYPE_KEY,
SeahorsePgpKey))
+#define SEAHORSE_PGP_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PGP_TYPE_KEY,
SeahorsePgpKeyClass))
+#define SEAHORSE_PGP_IS_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PGP_TYPE_KEY))
+#define SEAHORSE_PGP_IS_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PGP_TYPE_KEY))
+#define SEAHORSE_PGP_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PGP_TYPE_KEY,
SeahorsePgpKeyClass))
typedef struct _SeahorsePgpKey SeahorsePgpKey;
diff --git a/pgp/seahorse-pgp-photo.c b/pgp/seahorse-pgp-photo.c
index 924ecbce..2d3e3a3d 100644
--- a/pgp/seahorse-pgp-photo.c
+++ b/pgp/seahorse-pgp-photo.c
@@ -43,7 +43,7 @@ struct _SeahorsePgpPhotoPrivate {
static void
seahorse_pgp_photo_init (SeahorsePgpPhoto *self)
{
- self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PGP_PHOTO, SeahorsePgpPhotoPrivate);
+ self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PGP_TYPE_PHOTO, SeahorsePgpPhotoPrivate);
}
static void
@@ -108,20 +108,20 @@ seahorse_pgp_photo_class_init (SeahorsePgpPhotoClass *klass)
SeahorsePgpPhoto*
seahorse_pgp_photo_new (GdkPixbuf *pixbuf)
{
- return g_object_new (SEAHORSE_TYPE_PGP_PHOTO, "pixbuf", pixbuf, NULL);
+ return g_object_new (SEAHORSE_PGP_TYPE_PHOTO, "pixbuf", pixbuf, NULL);
}
GdkPixbuf*
seahorse_pgp_photo_get_pixbuf (SeahorsePgpPhoto *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_PHOTO (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_PHOTO (self), NULL);
return self->pv->pixbuf;
}
void
seahorse_pgp_photo_set_pixbuf (SeahorsePgpPhoto *self, GdkPixbuf* pixbuf)
{
- g_return_if_fail (SEAHORSE_IS_PGP_PHOTO (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_PHOTO (self));
if (self->pv->pixbuf)
g_object_unref (self->pv->pixbuf);
diff --git a/pgp/seahorse-pgp-photo.h b/pgp/seahorse-pgp-photo.h
index 54a348e2..7340d9f0 100644
--- a/pgp/seahorse-pgp-photo.h
+++ b/pgp/seahorse-pgp-photo.h
@@ -23,12 +23,12 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#define SEAHORSE_TYPE_PGP_PHOTO (seahorse_pgp_photo_get_type ())
-#define SEAHORSE_PGP_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_PHOTO,
SeahorsePgpPhoto))
-#define SEAHORSE_PGP_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_PHOTO,
SeahorsePgpPhotoClass))
-#define SEAHORSE_IS_PGP_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_PHOTO))
-#define SEAHORSE_IS_PGP_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_PHOTO))
-#define SEAHORSE_PGP_PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_PHOTO,
SeahorsePgpPhotoClass))
+#define SEAHORSE_PGP_TYPE_PHOTO (seahorse_pgp_photo_get_type ())
+#define SEAHORSE_PGP_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PGP_TYPE_PHOTO,
SeahorsePgpPhoto))
+#define SEAHORSE_PGP_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PGP_TYPE_PHOTO,
SeahorsePgpPhotoClass))
+#define SEAHORSE_PGP_IS_PHOTO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PGP_TYPE_PHOTO))
+#define SEAHORSE_PGP_IS_PHOTO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PGP_TYPE_PHOTO))
+#define SEAHORSE_PGP_PHOTO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PGP_TYPE_PHOTO,
SeahorsePgpPhotoClass))
typedef struct _SeahorsePgpPhoto SeahorsePgpPhoto;
typedef struct _SeahorsePgpPhotoClass SeahorsePgpPhotoClass;
diff --git a/pgp/seahorse-pgp-signature.c b/pgp/seahorse-pgp-signature.c
index 12612ba5..97058bdc 100644
--- a/pgp/seahorse-pgp-signature.c
+++ b/pgp/seahorse-pgp-signature.c
@@ -50,7 +50,7 @@ struct _SeahorsePgpSignaturePrivate {
static void
seahorse_pgp_signature_init (SeahorsePgpSignature *self)
{
- self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PGP_SIGNATURE,
SeahorsePgpSignaturePrivate);
+ self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PGP_TYPE_SIGNATURE,
SeahorsePgpSignaturePrivate);
}
static void
@@ -131,13 +131,13 @@ seahorse_pgp_signature_class_init (SeahorsePgpSignatureClass *klass)
SeahorsePgpSignature*
seahorse_pgp_signature_new (const gchar *keyid)
{
- return g_object_new (SEAHORSE_TYPE_PGP_SIGNATURE, "keyid", keyid, NULL);
+ return g_object_new (SEAHORSE_PGP_TYPE_SIGNATURE, "keyid", keyid, NULL);
}
guint
seahorse_pgp_signature_get_flags (SeahorsePgpSignature *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SIGNATURE (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SIGNATURE (self), 0);
return self->pv->flags;
}
@@ -146,7 +146,7 @@ seahorse_pgp_signature_set_flags (SeahorsePgpSignature *self, guint flags)
{
GObject *obj;
- g_return_if_fail (SEAHORSE_IS_PGP_SIGNATURE (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SIGNATURE (self));
self->pv->flags = flags;
obj = G_OBJECT (self);
@@ -159,7 +159,7 @@ seahorse_pgp_signature_set_flags (SeahorsePgpSignature *self, guint flags)
const gchar*
seahorse_pgp_signature_get_keyid (SeahorsePgpSignature *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SIGNATURE (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SIGNATURE (self), NULL);
return self->pv->keyid;
}
@@ -168,7 +168,7 @@ seahorse_pgp_signature_set_keyid (SeahorsePgpSignature *self, const gchar *keyid
{
GObject *obj;
- g_return_if_fail (SEAHORSE_IS_PGP_SIGNATURE (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SIGNATURE (self));
g_free (self->pv->keyid);
self->pv->keyid = g_strdup (keyid);
@@ -186,7 +186,7 @@ seahorse_pgp_signature_get_sigtype (SeahorsePgpSignature *self)
SeahorseGpgmeKey *key;
SeahorseObject *obj;
- g_return_val_if_fail (SEAHORSE_IS_PGP_SIGNATURE (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SIGNATURE (self), 0);
keyring = seahorse_pgp_backend_get_default_keyring (NULL);
key = seahorse_gpgme_keyring_lookup (keyring, self->pv->keyid);
diff --git a/pgp/seahorse-pgp-signature.h b/pgp/seahorse-pgp-signature.h
index 26c20f52..1bc84849 100644
--- a/pgp/seahorse-pgp-signature.h
+++ b/pgp/seahorse-pgp-signature.h
@@ -24,13 +24,13 @@
#include "seahorse-common.h"
-#define SEAHORSE_TYPE_PGP_SIGNATURE (seahorse_pgp_signature_get_type ())
+#define SEAHORSE_PGP_TYPE_SIGNATURE (seahorse_pgp_signature_get_type ())
-#define SEAHORSE_PGP_SIGNATURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
SEAHORSE_TYPE_PGP_SIGNATURE, SeahorsePgpSignature))
-#define SEAHORSE_PGP_SIGNATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
SEAHORSE_TYPE_PGP_SIGNATURE, SeahorsePgpSignatureClass))
-#define SEAHORSE_IS_PGP_SIGNATURE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
SEAHORSE_TYPE_PGP_SIGNATURE))
-#define SEAHORSE_IS_PGP_SIGNATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
SEAHORSE_TYPE_PGP_SIGNATURE))
-#define SEAHORSE_PGP_SIGNATURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
SEAHORSE_TYPE_PGP_SIGNATURE, SeahorsePgpSignatureClass))
+#define SEAHORSE_PGP_SIGNATURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
SEAHORSE_PGP_TYPE_SIGNATURE, SeahorsePgpSignature))
+#define SEAHORSE_PGP_SIGNATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
SEAHORSE_PGP_TYPE_SIGNATURE, SeahorsePgpSignatureClass))
+#define SEAHORSE_PGP_IS_SIGNATURE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
SEAHORSE_PGP_TYPE_SIGNATURE))
+#define SEAHORSE_PGP_IS_SIGNATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
SEAHORSE_PGP_TYPE_SIGNATURE))
+#define SEAHORSE_PGP_SIGNATURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
SEAHORSE_PGP_TYPE_SIGNATURE, SeahorsePgpSignatureClass))
typedef struct _SeahorsePgpSignature SeahorsePgpSignature;
typedef struct _SeahorsePgpSignatureClass SeahorsePgpSignatureClass;
diff --git a/pgp/seahorse-pgp-subkey.c b/pgp/seahorse-pgp-subkey.c
index e96ff5b0..7caf3eab 100644
--- a/pgp/seahorse-pgp-subkey.c
+++ b/pgp/seahorse-pgp-subkey.c
@@ -61,7 +61,7 @@ struct _SeahorsePgpSubkeyPrivate {
static void
seahorse_pgp_subkey_init (SeahorsePgpSubkey *self)
{
- self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PGP_SUBKEY, SeahorsePgpSubkeyPrivate);
+ self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PGP_TYPE_SUBKEY, SeahorsePgpSubkeyPrivate);
}
static void
@@ -214,20 +214,20 @@ seahorse_pgp_subkey_class_init (SeahorsePgpSubkeyClass *klass)
SeahorsePgpSubkey*
seahorse_pgp_subkey_new (void)
{
- return g_object_new (SEAHORSE_TYPE_PGP_SUBKEY, NULL);
+ return g_object_new (SEAHORSE_PGP_TYPE_SUBKEY, NULL);
}
guint
seahorse_pgp_subkey_get_index (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), 0);
return self->pv->index;
}
void
seahorse_pgp_subkey_set_index (SeahorsePgpSubkey *self, guint index)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
self->pv->index = index;
g_object_notify (G_OBJECT (self), "index");
}
@@ -235,14 +235,14 @@ seahorse_pgp_subkey_set_index (SeahorsePgpSubkey *self, guint index)
const gchar*
seahorse_pgp_subkey_get_keyid (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), NULL);
return self->pv->keyid;
}
void
seahorse_pgp_subkey_set_keyid (SeahorsePgpSubkey *self, const gchar *keyid)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
g_free (self->pv->keyid);
self->pv->keyid = g_strdup (keyid);
g_object_notify (G_OBJECT (self), "keyid");
@@ -251,14 +251,14 @@ seahorse_pgp_subkey_set_keyid (SeahorsePgpSubkey *self, const gchar *keyid)
guint
seahorse_pgp_subkey_get_flags (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), 0);
return self->pv->flags;
}
void
seahorse_pgp_subkey_set_flags (SeahorsePgpSubkey *self, guint flags)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
self->pv->flags = flags;
g_object_notify (G_OBJECT (self), "flags");
}
@@ -266,14 +266,14 @@ seahorse_pgp_subkey_set_flags (SeahorsePgpSubkey *self, guint flags)
guint
seahorse_pgp_subkey_get_length (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), 0);
return self->pv->length;
}
void
seahorse_pgp_subkey_set_length (SeahorsePgpSubkey *self, guint length)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
self->pv->length = length;
g_object_notify (G_OBJECT (self), "length");
}
@@ -297,7 +297,7 @@ seahorse_pgp_subkey_get_usage (SeahorsePgpSubkey *self)
gboolean previous;
int i;
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), NULL);
str = g_string_new (NULL);
@@ -319,14 +319,14 @@ seahorse_pgp_subkey_get_usage (SeahorsePgpSubkey *self)
const gchar*
seahorse_pgp_subkey_get_algorithm (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), NULL);
return self->pv->algorithm;
}
void
seahorse_pgp_subkey_set_algorithm (SeahorsePgpSubkey *self, const gchar *algorithm)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
g_free (self->pv->algorithm);
self->pv->algorithm = g_strdup (algorithm);
g_object_notify (G_OBJECT (self), "algorithm");
@@ -335,14 +335,14 @@ seahorse_pgp_subkey_set_algorithm (SeahorsePgpSubkey *self, const gchar *algorit
gulong
seahorse_pgp_subkey_get_created (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), 0);
return self->pv->created;
}
void
seahorse_pgp_subkey_set_created (SeahorsePgpSubkey *self, gulong created)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
self->pv->created = created;
g_object_notify (G_OBJECT (self), "created");
}
@@ -350,14 +350,14 @@ seahorse_pgp_subkey_set_created (SeahorsePgpSubkey *self, gulong created)
gulong
seahorse_pgp_subkey_get_expires (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), 0);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), 0);
return self->pv->expires;
}
void
seahorse_pgp_subkey_set_expires (SeahorsePgpSubkey *self, gulong expires)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
self->pv->expires = expires;
g_object_notify (G_OBJECT (self), "expires");
}
@@ -365,14 +365,14 @@ seahorse_pgp_subkey_set_expires (SeahorsePgpSubkey *self, gulong expires)
const gchar*
seahorse_pgp_subkey_get_fingerprint (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), NULL);
return self->pv->fingerprint;
}
void
seahorse_pgp_subkey_set_fingerprint (SeahorsePgpSubkey *self, const gchar *fingerprint)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
g_free (self->pv->fingerprint);
self->pv->fingerprint = g_strdup (fingerprint);
g_object_notify (G_OBJECT (self), "fingerprint");
@@ -381,14 +381,14 @@ seahorse_pgp_subkey_set_fingerprint (SeahorsePgpSubkey *self, const gchar *finge
const gchar*
seahorse_pgp_subkey_get_description (SeahorsePgpSubkey *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_SUBKEY (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_SUBKEY (self), NULL);
return self->pv->description;
}
void
seahorse_pgp_subkey_set_description (SeahorsePgpSubkey *self, const gchar *description)
{
- g_return_if_fail (SEAHORSE_IS_PGP_SUBKEY (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_SUBKEY (self));
g_free (self->pv->description);
self->pv->description = g_strdup (description);
g_object_notify (G_OBJECT (self), "description");
diff --git a/pgp/seahorse-pgp-subkey.h b/pgp/seahorse-pgp-subkey.h
index 7af4921a..7aa4804e 100644
--- a/pgp/seahorse-pgp-subkey.h
+++ b/pgp/seahorse-pgp-subkey.h
@@ -24,13 +24,13 @@
#include "seahorse-common.h"
-#define SEAHORSE_TYPE_PGP_SUBKEY (seahorse_pgp_subkey_get_type ())
+#define SEAHORSE_PGP_TYPE_SUBKEY (seahorse_pgp_subkey_get_type ())
-#define SEAHORSE_PGP_SUBKEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_SUBKEY,
SeahorsePgpSubkey))
-#define SEAHORSE_PGP_SUBKEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_SUBKEY,
SeahorsePgpSubkeyClass))
-#define SEAHORSE_IS_PGP_SUBKEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_SUBKEY))
-#define SEAHORSE_IS_PGP_SUBKEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_SUBKEY))
-#define SEAHORSE_PGP_SUBKEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_SUBKEY,
SeahorsePgpSubkeyClass))
+#define SEAHORSE_PGP_SUBKEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PGP_TYPE_SUBKEY,
SeahorsePgpSubkey))
+#define SEAHORSE_PGP_SUBKEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PGP_TYPE_SUBKEY,
SeahorsePgpSubkeyClass))
+#define SEAHORSE_PGP_IS_SUBKEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PGP_TYPE_SUBKEY))
+#define SEAHORSE_PGP_IS_SUBKEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PGP_TYPE_SUBKEY))
+#define SEAHORSE_PGP_SUBKEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PGP_TYPE_SUBKEY,
SeahorsePgpSubkeyClass))
typedef struct _SeahorsePgpSubkey SeahorsePgpSubkey;
typedef struct _SeahorsePgpSubkeyClass SeahorsePgpSubkeyClass;
diff --git a/pgp/seahorse-pgp-uid.c b/pgp/seahorse-pgp-uid.c
index 846c00ed..210351df 100644
--- a/pgp/seahorse-pgp-uid.c
+++ b/pgp/seahorse-pgp-uid.c
@@ -219,7 +219,7 @@ seahorse_pgp_uid_realize (SeahorsePgpUid *self)
static void
seahorse_pgp_uid_init (SeahorsePgpUid *self)
{
- self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PGP_UID, SeahorsePgpUidPrivate);
+ self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PGP_TYPE_UID, SeahorsePgpUidPrivate);
g_object_set (self, "icon", NULL, "usage", SEAHORSE_USAGE_IDENTITY, NULL);
}
@@ -326,7 +326,7 @@ seahorse_pgp_uid_class_init (SeahorsePgpUidClass *klass)
g_object_class_install_property (gobject_class, PROP_PARENT,
g_param_spec_object ("parent", "Parent Key", "Parent Key",
- SEAHORSE_TYPE_PGP_KEY, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ SEAHORSE_PGP_TYPE_KEY, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (gobject_class, PROP_NAME,
g_param_spec_string ("name", "Name", "User ID name",
@@ -361,7 +361,7 @@ seahorse_pgp_uid_new (SeahorsePgpKey *parent,
if (uid_string)
parse_user_id (uid_string, &name, &email, &comment);
- uid = g_object_new (SEAHORSE_TYPE_PGP_UID,
+ uid = g_object_new (SEAHORSE_PGP_TYPE_UID,
"parent", parent,
"name", name,
"email", email,
@@ -378,21 +378,21 @@ seahorse_pgp_uid_new (SeahorsePgpKey *parent,
SeahorsePgpKey *
seahorse_pgp_uid_get_parent (SeahorsePgpUid *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_UID (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_UID (self), NULL);
return self->pv->parent;
}
GList*
seahorse_pgp_uid_get_signatures (SeahorsePgpUid *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_UID (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_UID (self), NULL);
return self->pv->signatures;
}
void
seahorse_pgp_uid_set_signatures (SeahorsePgpUid *self, GList *signatures)
{
- g_return_if_fail (SEAHORSE_IS_PGP_UID (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_UID (self));
seahorse_object_list_free (self->pv->signatures);
self->pv->signatures = seahorse_object_list_copy (signatures);
@@ -403,14 +403,14 @@ seahorse_pgp_uid_set_signatures (SeahorsePgpUid *self, GList *signatures)
SeahorseValidity
seahorse_pgp_uid_get_validity (SeahorsePgpUid *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_UID (self), SEAHORSE_VALIDITY_UNKNOWN);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_UID (self), SEAHORSE_VALIDITY_UNKNOWN);
return self->pv->validity;
}
void
seahorse_pgp_uid_set_validity (SeahorsePgpUid *self, SeahorseValidity validity)
{
- g_return_if_fail (SEAHORSE_IS_PGP_UID (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_UID (self));
self->pv->validity = validity;
g_object_notify (G_OBJECT (self), "validity");
}
@@ -418,7 +418,7 @@ seahorse_pgp_uid_set_validity (SeahorsePgpUid *self, SeahorseValidity validity)
const gchar*
seahorse_pgp_uid_get_name (SeahorsePgpUid *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_UID (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_UID (self), NULL);
if (!self->pv->name)
self->pv->name = g_strdup ("");
return self->pv->name;
@@ -429,7 +429,7 @@ seahorse_pgp_uid_set_name (SeahorsePgpUid *self, const gchar *name)
{
GObject *obj;
- g_return_if_fail (SEAHORSE_IS_PGP_UID (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_UID (self));
g_free (self->pv->name);
self->pv->name = convert_string (name);
@@ -445,7 +445,7 @@ seahorse_pgp_uid_set_name (SeahorsePgpUid *self, const gchar *name)
const gchar*
seahorse_pgp_uid_get_email (SeahorsePgpUid *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_UID (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_UID (self), NULL);
if (!self->pv->email)
self->pv->email = g_strdup ("");
return self->pv->email;
@@ -456,7 +456,7 @@ seahorse_pgp_uid_set_email (SeahorsePgpUid *self, const gchar *email)
{
GObject *obj;
- g_return_if_fail (SEAHORSE_IS_PGP_UID (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_UID (self));
g_free (self->pv->email);
self->pv->email = convert_string (email);
@@ -472,7 +472,7 @@ seahorse_pgp_uid_set_email (SeahorsePgpUid *self, const gchar *email)
const gchar*
seahorse_pgp_uid_get_comment (SeahorsePgpUid *self)
{
- g_return_val_if_fail (SEAHORSE_IS_PGP_UID (self), NULL);
+ g_return_val_if_fail (SEAHORSE_PGP_IS_UID (self), NULL);
if (!self->pv->comment)
self->pv->comment = g_strdup ("");
return self->pv->comment;
@@ -483,7 +483,7 @@ seahorse_pgp_uid_set_comment (SeahorsePgpUid *self, const gchar *comment)
{
GObject *obj;
- g_return_if_fail (SEAHORSE_IS_PGP_UID (self));
+ g_return_if_fail (SEAHORSE_PGP_IS_UID (self));
g_free (self->pv->comment);
self->pv->comment = convert_string (comment);
diff --git a/pgp/seahorse-pgp-uid.h b/pgp/seahorse-pgp-uid.h
index 2d6790a6..77e59b9d 100644
--- a/pgp/seahorse-pgp-uid.h
+++ b/pgp/seahorse-pgp-uid.h
@@ -26,13 +26,13 @@
#include "seahorse-pgp-key.h"
-#define SEAHORSE_TYPE_PGP_UID (seahorse_pgp_uid_get_type ())
+#define SEAHORSE_PGP_TYPE_UID (seahorse_pgp_uid_get_type ())
-#define SEAHORSE_PGP_UID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_UID,
SeahorsePgpUid))
-#define SEAHORSE_PGP_UID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_UID,
SeahorsePgpUidClass))
-#define SEAHORSE_IS_PGP_UID(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_UID))
-#define SEAHORSE_IS_PGP_UID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_UID))
-#define SEAHORSE_PGP_UID_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_UID,
SeahorsePgpUidClass))
+#define SEAHORSE_PGP_UID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PGP_TYPE_UID,
SeahorsePgpUid))
+#define SEAHORSE_PGP_UID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PGP_TYPE_UID,
SeahorsePgpUidClass))
+#define SEAHORSE_PGP_IS_UID(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PGP_TYPE_UID))
+#define SEAHORSE_PGP_IS_UID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PGP_TYPE_UID))
+#define SEAHORSE_PGP_UID_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PGP_TYPE_UID,
SeahorsePgpUidClass))
typedef struct _SeahorsePgpUid SeahorsePgpUid;
typedef struct _SeahorsePgpUidClass SeahorsePgpUidClass;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
