diff options
35 files changed, 101 insertions, 122 deletions
diff --git a/gck/Gck-1.metadata b/gck/Gck-1.metadata index 213a679..90493c2 100644 --- a/gck/Gck-1.metadata +++ b/gck/Gck-1.metadata @@ -8,6 +8,9 @@ Attribute .length skip=true .value skip=true +Attributes + .new_empty skip=false sentinel="GCK_INVALID" + Enumerator .set_object_type_full name="set_object_type" diff --git a/gcr/gcr-certificate-chain.h b/gcr/gcr-certificate-chain.h index 002db1b..78decd5 100644 --- a/gcr/gcr-certificate-chain.h +++ b/gcr/gcr-certificate-chain.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_CERTIFICATE_CHAIN_H__ #define __GCR_CERTIFICATE_CHAIN_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib-object.h> #include "gcr-certificate.h" diff --git a/gcr/gcr-certificate-extensions.h b/gcr/gcr-certificate-extensions.h index 0e5d135..6b42d44 100644 --- a/gcr/gcr-certificate-extensions.h +++ b/gcr/gcr-certificate-extensions.h @@ -20,7 +20,7 @@ */ #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." +#error "Only <gcr/gcr.h> can be included directly." #endif #ifndef GCR_CERTIFICATE_EXTENSIONS_H diff --git a/gcr/gcr-certificate-request.h b/gcr/gcr-certificate-request.h index d8acdbd..623dc3d 100644 --- a/gcr/gcr-certificate-request.h +++ b/gcr/gcr-certificate-request.h @@ -17,13 +17,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_CERTIFICATE_REQUEST_H__ #define __GCR_CERTIFICATE_REQUEST_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib-object.h> #include "gcr-types.h" diff --git a/gcr/gcr-certificate.h b/gcr/gcr-certificate.h index 3cd2c18..12a1275 100644 --- a/gcr/gcr-certificate.h +++ b/gcr/gcr-certificate.h @@ -17,13 +17,13 @@ * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_CERTIFICATE_H__ #define __GCR_CERTIFICATE_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-types.h" #include "gcr-column.h" #include "gcr-comparable.h" diff --git a/gcr/gcr-column.h b/gcr/gcr-column.h index a6eb75b..9867575 100644 --- a/gcr/gcr-column.h +++ b/gcr/gcr-column.h @@ -20,6 +20,10 @@ #ifndef __GCR_COLUMN_H__ #define __GCR_COLUMN_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-types.h" #include <glib-object.h> diff --git a/gcr/gcr-comparable.h b/gcr/gcr-comparable.h index 8d2208e..8e1fb65 100644 --- a/gcr/gcr-comparable.h +++ b/gcr/gcr-comparable.h @@ -20,6 +20,10 @@ #ifndef __GCR_COMPARABLE_H__ #define __GCR_COMPARABLE_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib-object.h> G_BEGIN_DECLS diff --git a/gcr/gcr-fingerprint.h b/gcr/gcr-fingerprint.h index 299f087..9b19719 100644 --- a/gcr/gcr-fingerprint.h +++ b/gcr/gcr-fingerprint.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCR_FINGERPRINT_H #define GCR_FINGERPRINT_H +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib.h> #include "gcr-types.h" diff --git a/gcr/gcr-gnupg-importer.h b/gcr/gcr-gnupg-importer.h index 4bb9550..6b75607 100644 --- a/gcr/gcr-gnupg-importer.h +++ b/gcr/gcr-gnupg-importer.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_H_INSIDE__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> can be included directly." -#endif - #ifndef __GCR_GNUPG_IMPORTER_H__ #define __GCR_GNUPG_IMPORTER_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-importer.h" #include <glib-object.h> diff --git a/gcr/gcr-gnupg-key.h b/gcr/gcr-gnupg-key.h index 1daed6d..9a3da2b 100644 --- a/gcr/gcr-gnupg-key.h +++ b/gcr/gcr-gnupg-key.h @@ -17,13 +17,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCR_GNUPG_KEY_H #define GCR_GNUPG_KEY_H +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib-object.h> #include "gcr-column.h" diff --git a/gcr/gcr-gnupg-records.h b/gcr/gcr-gnupg-records.h index 4f4e673..1f26538 100644 --- a/gcr/gcr-gnupg-records.h +++ b/gcr/gcr-gnupg-records.h @@ -17,10 +17,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_H_INSIDE__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> can be included directly." -#endif - #ifndef GCR_GNUPG_RECORDS_H #define GCR_GNUPG_RECORDS_H diff --git a/gcr/gcr-gnupg-util.h b/gcr/gcr-gnupg-util.h index 300cda8..48c8b6a 100644 --- a/gcr/gcr-gnupg-util.h +++ b/gcr/gcr-gnupg-util.h @@ -17,10 +17,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCR_GNUPG_UTIL_H #define GCR_GNUPG_UTIL_H diff --git a/gcr/gcr-icons.h b/gcr/gcr-icons.h index f4b981a..4915fe1 100644 --- a/gcr/gcr-icons.h +++ b/gcr/gcr-icons.h @@ -18,13 +18,13 @@ * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_ICONS_H__ #define __GCR_ICONS_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <gck/gck.h> #include <gio/gio.h> diff --git a/gcr/gcr-import-interaction.h b/gcr/gcr-import-interaction.h index a0af10e..180cbb9 100644 --- a/gcr/gcr-import-interaction.h +++ b/gcr/gcr-import-interaction.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_IMPORT_INTERACTION_H__ #define __GCR_IMPORT_INTERACTION_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-importer.h" #include <glib-object.h> diff --git a/gcr/gcr-importer.h b/gcr/gcr-importer.h index 721b214..3eab68c 100644 --- a/gcr/gcr-importer.h +++ b/gcr/gcr-importer.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_IMPORTER_H__ #define __GCR_IMPORTER_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-parser.h" #include <glib-object.h> diff --git a/gcr/gcr-key-mechanisms.h b/gcr/gcr-key-mechanisms.h index 37cf46c..dc33085 100644 --- a/gcr/gcr-key-mechanisms.h +++ b/gcr/gcr-key-mechanisms.h @@ -17,10 +17,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_KEY_MECHANISMS_H__ #define __GCR_KEY_MECHANISMS_H__ diff --git a/gcr/gcr-library.h b/gcr/gcr-library.h index 9650497..91c240a 100644 --- a/gcr/gcr-library.h +++ b/gcr/gcr-library.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCR_LIBRARY_H_ #define GCR_LIBRARY_H_ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-types.h" #include <glib.h> diff --git a/gcr/gcr-mock-prompter.h b/gcr/gcr-mock-prompter.h index 369fd5f..f0585d7 100644 --- a/gcr/gcr-mock-prompter.h +++ b/gcr/gcr-mock-prompter.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_MOCK_PROMPTER_H__ #define __GCR_MOCK_PROMPTER_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-system-prompter.h" #include <glib-object.h> diff --git a/gcr/gcr-openpgp.h b/gcr/gcr-openpgp.h index f4825e1..c98c927 100644 --- a/gcr/gcr-openpgp.h +++ b/gcr/gcr-openpgp.h @@ -19,10 +19,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_H_INSIDE__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> can be included directly." -#endif - #ifndef __GCR_OPENPGP_H__ #define __GCR_OPENPGP_H__ diff --git a/gcr/gcr-openssh.h b/gcr/gcr-openssh.h index a179afa..6fe75d5 100644 --- a/gcr/gcr-openssh.h +++ b/gcr/gcr-openssh.h @@ -19,10 +19,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_H_INSIDE__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> can be included directly." -#endif - #ifndef __GCR_OPENSSH_H__ #define __GCR_OPENSSH_H__ diff --git a/gcr/gcr-parser.h b/gcr/gcr-parser.h index a19a98f..67b3bca 100644 --- a/gcr/gcr-parser.h +++ b/gcr/gcr-parser.h @@ -17,13 +17,13 @@ * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_PARSER_H__ #define __GCR_PARSER_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib-object.h> #include <gio/gio.h> diff --git a/gcr/gcr-pkcs11-certificate.h b/gcr/gcr-pkcs11-certificate.h index a1cd444..2ed2085 100644 --- a/gcr/gcr-pkcs11-certificate.h +++ b/gcr/gcr-pkcs11-certificate.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_PKCS11_CERTIFICATE_H__ #define __GCR_PKCS11_CERTIFICATE_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-types.h" #include "gcr-certificate.h" diff --git a/gcr/gcr-pkcs11-importer.h b/gcr/gcr-pkcs11-importer.h index 3b1780d..c35655f 100644 --- a/gcr/gcr-pkcs11-importer.h +++ b/gcr/gcr-pkcs11-importer.h @@ -20,10 +20,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_H_INSIDE__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> can be included directly." -#endif - #ifndef __GCR_PKCS11_IMPORTER_H__ #define __GCR_PKCS11_IMPORTER_H__ diff --git a/gcr/gcr-prompt.h b/gcr/gcr-prompt.h index 0a56ad1..7c741fc 100644 --- a/gcr/gcr-prompt.h +++ b/gcr/gcr-prompt.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stef@thewalter.net> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_PROMPT_H__ #define __GCR_PROMPT_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-types.h" #include <glib-object.h> diff --git a/gcr/gcr-record.h b/gcr/gcr-record.h index 755de10..640f157 100644 --- a/gcr/gcr-record.h +++ b/gcr/gcr-record.h @@ -19,10 +19,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCR_RECORD_H #define GCR_RECORD_H diff --git a/gcr/gcr-secret-exchange.h b/gcr/gcr-secret-exchange.h index 582558f..a5f3663 100644 --- a/gcr/gcr-secret-exchange.h +++ b/gcr/gcr-secret-exchange.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_SECRET_EXCHANGE_H__ #define __GCR_SECRET_EXCHANGE_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <gck/gck.h> #include <glib-object.h> diff --git a/gcr/gcr-secure-memory.h b/gcr/gcr-secure-memory.h index 2d562fc..5f46e13 100644 --- a/gcr/gcr-secure-memory.h +++ b/gcr/gcr-secure-memory.h @@ -21,13 +21,13 @@ Author: Stef Walter <stefw@gnome.org> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCR_SECURE_MEMORY_H #define GCR_SECURE_MEMORY_H +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib.h> G_BEGIN_DECLS diff --git a/gcr/gcr-simple-certificate.h b/gcr/gcr-simple-certificate.h index 14e54c6..eb97635 100644 --- a/gcr/gcr-simple-certificate.h +++ b/gcr/gcr-simple-certificate.h @@ -17,13 +17,13 @@ * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_SIMPLE_CERTIFICATE_H__ #define __GCR_SIMPLE_CERTIFICATE_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib-object.h> #include "gcr-certificate.h" diff --git a/gcr/gcr-ssh-askpass.h b/gcr/gcr-ssh-askpass.h index b766974..fb54a7e 100644 --- a/gcr/gcr-ssh-askpass.h +++ b/gcr/gcr-ssh-askpass.h @@ -17,13 +17,13 @@ * Author: Stef Walter <stefw@gnome.org> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_SSH_ASKPASS_H__ #define __GCR_SSH_ASKPASS_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib-object.h> #include <gio/gio.h> diff --git a/gcr/gcr-subject-public-key.h b/gcr/gcr-subject-public-key.h index 9e7c1d9..066fa22 100644 --- a/gcr/gcr-subject-public-key.h +++ b/gcr/gcr-subject-public-key.h @@ -19,10 +19,6 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCR_SUBJECT_PUBLIC_KEY_H #define GCR_SUBJECT_PUBLIC_KEY_H diff --git a/gcr/gcr-system-prompt.h b/gcr/gcr-system-prompt.h index 0d20782..017ebef 100644 --- a/gcr/gcr-system-prompt.h +++ b/gcr/gcr-system-prompt.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stef@thewalter.net> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_SYSTEM_PROMPT_H__ #define __GCR_SYSTEM_PROMPT_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-types.h" #include "gcr-secret-exchange.h" diff --git a/gcr/gcr-system-prompter.h b/gcr/gcr-system-prompter.h index 72b7c69..653383b 100644 --- a/gcr/gcr-system-prompter.h +++ b/gcr/gcr-system-prompter.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stef@thewalter.net> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_SYSTEM_PROMPTER_H__ #define __GCR_SYSTEM_PROMPTER_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-prompt.h" #include "gcr-secret-exchange.h" #include "gcr-types.h" diff --git a/gcr/gcr-trust.h b/gcr/gcr-trust.h index 379f363..88b407c 100644 --- a/gcr/gcr-trust.h +++ b/gcr/gcr-trust.h @@ -17,13 +17,13 @@ * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef __GCR_TRUST_H__ #define __GCR_TRUST_H__ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include "gcr-certificate.h" #include "gcr-types.h" diff --git a/gcr/gcr-types.h b/gcr/gcr-types.h index 095615a..d049cb4 100644 --- a/gcr/gcr-types.h +++ b/gcr/gcr-types.h @@ -19,13 +19,13 @@ * Author: Stef Walter <stefw@collabora.co.uk> */ -#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." -#endif - #ifndef GCRTYPES_H_ #define GCRTYPES_H_ +#if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) +#error "Only <gcr/gcr.h> can be included directly." +#endif + #include <glib.h> #ifndef GCK_API_SUBJECT_TO_CHANGE diff --git a/gcr/gcr-version.h.in b/gcr/gcr-version.h.in index 81a5b4a..5f991d7 100644 --- a/gcr/gcr-version.h.in +++ b/gcr/gcr-version.h.in @@ -23,7 +23,7 @@ #define __GCR_VERSION_H__ #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION) -#error "Only <gcr/gcr.h> or <gcr/gcr-base.h> can be included directly." +#error "Only <gcr/gcr.h> can be included directly." #endif /* compile time version |