[gnome-keyring/trust-store: 25/26] [gcr] Include libgck headers explictly in gcr headers.
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/trust-store: 25/26] [gcr] Include libgck headers explictly in gcr headers.
- Date: Mon, 6 Dec 2010 22:44:25 +0000 (UTC)
commit e85ae4c3d5c72da2689a75e457b859a1acb5ac92
Author: Stef Walter <stefw collabora co uk>
Date: Mon Dec 6 22:28:36 2010 +0000
[gcr] Include libgck headers explictly in gcr headers.
When we derive objects from gck objects, we have to include the
headers properly and not try to hide them.
gcr/Makefile.am | 2 ++
gcr/gcr-certificate-renderer.h | 4 ++--
gcr/gcr-certificate-widget.h | 4 ++--
gcr/gcr-importer.h | 10 +++++-----
gcr/gcr-initializer.h | 4 ++--
gcr/gcr-key-renderer.h | 6 +++---
gcr/gcr-key-widget.h | 6 +++---
gcr/gcr-parser.h | 2 +-
gcr/gcr-renderer.h | 4 ++--
gcr/gcr-types.h | 16 +++++++++++-----
gcr/gcr.h | 3 ++-
11 files changed, 35 insertions(+), 26 deletions(-)
---
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 9675eb1..5a5288e 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -22,6 +22,7 @@ inc_HEADERS = \
gcr-key-widget.h \
gcr-importer.h \
gcr-parser.h \
+ gcr-pkcs11-certificate.h \
gcr-renderer.h \
gcr-simple-certificate.h \
gcr-trust.h \
@@ -60,6 +61,7 @@ libgcr GCR_VERSION_SUFFIX@_la_SOURCES = \
gcr-key-widget.c gcr-key-widget.h \
gcr-library.c \
gcr-parser.c gcr-parser.h \
+ gcr-pkcs11-certificate.c gcr-pkcs11-certificate.h \
gcr-renderer.c gcr-renderer.h \
gcr-simple-certificate.c gcr-simple-certificate.h \
gcr-trust.c gcr-trust.h \
diff --git a/gcr/gcr-certificate-renderer.h b/gcr/gcr-certificate-renderer.h
index e91787b..9ab6157 100644
--- a/gcr/gcr-certificate-renderer.h
+++ b/gcr/gcr-certificate-renderer.h
@@ -61,10 +61,10 @@ GcrCertificate* gcr_certificate_renderer_get_certificate (GcrCertif
void gcr_certificate_renderer_set_certificate (GcrCertificateRenderer *self,
GcrCertificate *cert);
-struct _GckAttributes* gcr_certificate_renderer_get_attributes (GcrCertificateRenderer *self);
+GckAttributes* gcr_certificate_renderer_get_attributes (GcrCertificateRenderer *self);
void gcr_certificate_renderer_set_attributes (GcrCertificateRenderer *self,
- struct _GckAttributes *attrs);
+ GckAttributes *attrs);
G_END_DECLS
diff --git a/gcr/gcr-certificate-widget.h b/gcr/gcr-certificate-widget.h
index 1da64fa..cf62f27 100644
--- a/gcr/gcr-certificate-widget.h
+++ b/gcr/gcr-certificate-widget.h
@@ -61,10 +61,10 @@ GcrCertificate* gcr_certificate_widget_get_certificate (GcrCertif
void gcr_certificate_widget_set_certificate (GcrCertificateWidget *self,
GcrCertificate *cert);
-struct _GckAttributes* gcr_certificate_widget_get_attributes (GcrCertificateWidget *self);
+GckAttributes* gcr_certificate_widget_get_attributes (GcrCertificateWidget *self);
void gcr_certificate_widget_set_attributes (GcrCertificateWidget *self,
- struct _GckAttributes* attrs);
+ GckAttributes* attrs);
G_END_DECLS
diff --git a/gcr/gcr-importer.h b/gcr/gcr-importer.h
index 3d6eb13..dfb6882 100644
--- a/gcr/gcr-importer.h
+++ b/gcr/gcr-importer.h
@@ -59,18 +59,18 @@ struct _GcrImporterClass {
GObjectClass parent_class;
/* signals */
- void (*queued) (GcrImporter *self, const gchar *label, struct _GckAttributes *attrs);
- void (*imported) (GcrImporter *self, struct _GckObject *object);
+ void (*queued) (GcrImporter *self, const gchar *label, GckAttributes *attrs);
+ void (*imported) (GcrImporter *self, GckObject *object);
};
GType gcr_importer_get_type (void);
GcrImporter* gcr_importer_new (void);
-struct _GckSlot* gcr_importer_get_slot (GcrImporter *self);
+GckSlot* gcr_importer_get_slot (GcrImporter *self);
void gcr_importer_set_slot (GcrImporter *self,
- struct _GckSlot *slot);
+ GckSlot *slot);
GcrImporterPromptBehavior gcr_importer_get_prompt_behavior (GcrImporter *self);
@@ -79,7 +79,7 @@ void gcr_importer_set_prompt_behavior (GcrImporter *self
void gcr_importer_queue (GcrImporter *self,
const gchar *label,
- struct _GckAttributes *attrs);
+ GckAttributes *attrs);
void gcr_importer_listen (GcrImporter *self,
GcrParser *parser);
diff --git a/gcr/gcr-initializer.h b/gcr/gcr-initializer.h
index 15d99bf..6e8f5ef 100644
--- a/gcr/gcr-initializer.h
+++ b/gcr/gcr-initializer.h
@@ -50,9 +50,9 @@ struct _GcrTokenManagerClass {
GType gcr_token_manager_get_type (void);
-GcrTokenManager* gcr_token_manager_new (struct _GckSlot *slot);
+GcrTokenManager* gcr_token_manager_new (GckSlot *slot);
-struct _GckSlot* gcr_token_manager_get_slot (GcrTokenManager *self);
+GckSlot* gcr_token_manager_get_slot (GcrTokenManager *self);
gboolean gcr_token_manager_initialize (GcrTokenManager *self,
GCancellable *cancel,
diff --git a/gcr/gcr-key-renderer.h b/gcr/gcr-key-renderer.h
index ead181d..a03780e 100644
--- a/gcr/gcr-key-renderer.h
+++ b/gcr/gcr-key-renderer.h
@@ -54,12 +54,12 @@ struct _GcrKeyRendererClass {
GType gcr_key_renderer_get_type (void);
GcrKeyRenderer* gcr_key_renderer_new (const gchar *label,
- struct _GckAttributes *attrs);
+ GckAttributes *attrs);
void gcr_key_renderer_set_attributes (GcrKeyRenderer *self,
- struct _GckAttributes *attrs);
+ GckAttributes *attrs);
-struct _GckAttributes* gcr_key_renderer_get_attributes (GcrKeyRenderer *self);
+GckAttributes* gcr_key_renderer_get_attributes (GcrKeyRenderer *self);
G_END_DECLS
diff --git a/gcr/gcr-key-widget.h b/gcr/gcr-key-widget.h
index 7c321f7..e943d43 100644
--- a/gcr/gcr-key-widget.h
+++ b/gcr/gcr-key-widget.h
@@ -53,12 +53,12 @@ struct _GcrKeyWidgetClass {
GType gcr_key_widget_get_type (void);
-GcrKeyWidget* gcr_key_widget_new (struct _GckAttributes *attrs);
+GcrKeyWidget* gcr_key_widget_new (GckAttributes *attrs);
void gcr_key_widget_set_attributes (GcrKeyWidget *self,
- struct _GckAttributes *attrs);
+ GckAttributes *attrs);
-struct _GckAttributes* gcr_key_widget_get_attributes (GcrKeyWidget *self);
+GckAttributes* gcr_key_widget_get_attributes (GcrKeyWidget *self);
G_END_DECLS
diff --git a/gcr/gcr-parser.h b/gcr/gcr-parser.h
index dc1a340..d7ef25b 100644
--- a/gcr/gcr-parser.h
+++ b/gcr/gcr-parser.h
@@ -101,7 +101,7 @@ const gchar* gcr_parser_get_parsed_label (GcrParser *self);
const gchar* gcr_parser_get_parsed_description (GcrParser *self);
-struct _GckAttributes* gcr_parser_get_parsed_attributes (GcrParser *self);
+GckAttributes* gcr_parser_get_parsed_attributes (GcrParser *self);
G_END_DECLS
diff --git a/gcr/gcr-renderer.h b/gcr/gcr-renderer.h
index 9c4800a..a9bde34 100644
--- a/gcr/gcr-renderer.h
+++ b/gcr/gcr-renderer.h
@@ -63,10 +63,10 @@ void gcr_renderer_render (GcrRenderer *
void gcr_renderer_emit_data_changed (GcrRenderer *self);
GcrRenderer* gcr_renderer_create (const gchar *label,
- struct _GckAttributes *attrs);
+ GckAttributes *attrs);
void gcr_renderer_register (GType renderer_type,
- struct _GckAttributes *attrs);
+ GckAttributes *attrs);
G_END_DECLS
diff --git a/gcr/gcr-types.h b/gcr/gcr-types.h
index 8bb14d4..0f38967 100644
--- a/gcr/gcr-types.h
+++ b/gcr/gcr-types.h
@@ -30,6 +30,17 @@
#include <glib.h>
+#ifndef GCK_API_SUBJECT_TO_CHANGE
+#define GCK_API_SUBJECT_TO_CHANGE 1
+#define __GCR_DEFINED_GCK_SUBJECT_TO_CHANGE__ 1
+#endif
+
+#include <gck/gck.h>
+
+#ifdef __GCR_DEFINED_GCK_SUBJECT_TO_CHANGE__
+#undef GCK_API_SUBJECT_TO_CHANGE
+#endif
+
G_BEGIN_DECLS
#define GCR_DATA_ERROR (gcr_data_error_get_domain ())
@@ -74,11 +85,6 @@ enum {
GCR_FORMAT_PEM_PKCS12
};
-/* Forward declare some of the Gck objects */
-struct _GckAttributes;
-struct _GckObject;
-struct _GckSlot;
-
G_END_DECLS
#endif /* GCRTYPES_H_ */
diff --git a/gcr/gcr.h b/gcr/gcr.h
index be822ab..ec7e4e2 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -32,6 +32,8 @@
#define __GCR_H_INSIDE__
+#include "gcr-types.h"
+
#include "gcr-certificate.h"
#include "gcr-certificate-renderer.h"
#include "gcr-certificate-widget.h"
@@ -42,7 +44,6 @@
#include "gcr-pkcs11-certificate.h"
#include "gcr-simple-certificate.h"
#include "gcr-trust.h"
-#include "gcr-types.h"
#include "gcr-unlock-options.h"
#include "gcr-unlock-options-widget.h"
#include "gcr-viewer.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
