[gcr/main: 11/21] gcr: Update the inclusion guard to not mention gcr-base

From: Corentin Noël <corentinnoel src gnome org>
To: commits-list gnome org
Cc:
Subject: [gcr/main: 11/21] gcr: Update the inclusion guard to not mention gcr-base
Date: Thu, 3 Mar 2022 14:52:37 +0000 (UTC)

commit c60e7170657dbe8a7d0f51b2e6f45187dc98a2c9
Author: Corentin Noël <corentin noel collabora com>
Date:   Fri Dec 10 10:44:09 2021 +0100

    gcr: Update the inclusion guard to not mention gcr-base
    
    Signed-off-by: Corentin Noël <corentin noel collabora com>

 gck/Gck-1.metadata               | 3 +++
 gcr/gcr-certificate-chain.h      | 8 ++++----
 gcr/gcr-certificate-extensions.h | 2 +-
 gcr/gcr-certificate-request.h    | 8 ++++----
 gcr/gcr-certificate.h            | 8 ++++----
 gcr/gcr-column.h                 | 4 ++++
 gcr/gcr-comparable.h             | 4 ++++
 gcr/gcr-fingerprint.h            | 8 ++++----
 gcr/gcr-gnupg-importer.h         | 8 ++++----
 gcr/gcr-gnupg-key.h              | 8 ++++----
 gcr/gcr-gnupg-records.h          | 4 ----
 gcr/gcr-gnupg-util.h             | 4 ----
 gcr/gcr-icons.h                  | 8 ++++----
 gcr/gcr-import-interaction.h     | 8 ++++----
 gcr/gcr-importer.h               | 8 ++++----
 gcr/gcr-key-mechanisms.h         | 4 ----
 gcr/gcr-library.h                | 8 ++++----
 gcr/gcr-mock-prompter.h          | 8 ++++----
 gcr/gcr-openpgp.h                | 4 ----
 gcr/gcr-openssh.h                | 4 ----
 gcr/gcr-parser.h                 | 8 ++++----
 gcr/gcr-pkcs11-certificate.h     | 8 ++++----
 gcr/gcr-pkcs11-importer.h        | 4 ----
 gcr/gcr-prompt.h                 | 8 ++++----
 gcr/gcr-record.h                 | 4 ----
 gcr/gcr-secret-exchange.h        | 8 ++++----
 gcr/gcr-secure-memory.h          | 8 ++++----
 gcr/gcr-simple-certificate.h     | 8 ++++----
 gcr/gcr-ssh-askpass.h            | 8 ++++----
 gcr/gcr-subject-public-key.h     | 4 ----
 gcr/gcr-system-prompt.h          | 8 ++++----
 gcr/gcr-system-prompter.h        | 8 ++++----
 gcr/gcr-trust.h                  | 8 ++++----
 gcr/gcr-types.h                  | 8 ++++----
 gcr/gcr-version.h.in             | 2 +-
 35 files changed, 101 insertions(+), 122 deletions(-)
---
diff --git a/gck/Gck-1.metadata b/gck/Gck-1.metadata
index 213a6792..90493c25 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 002db1b0..78decd58 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 0e5d1353..6b42d44d 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 d8acdbd4..623dc3d4 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 3cd2c18d..12a12752 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 a6eb75b3..98675753 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 8d2208e2..8e1fb65b 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 299f0872..9b19719e 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 4bb95506..6b75607b 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 1daed6da..9a3da2b8 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 4f4e673d..1f26538e 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 300cda81..48c8b6a7 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 f4b981ac..4915fe1d 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 a0af10e9..180cbb95 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 721b2144..3eab68c0 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 37cf46cb..dc330857 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 9650497d..91c240a8 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 369fd5f1..f0585d76 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 f4825e1f..c98c9277 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 a179afa7..6fe75d58 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 a19a98f9..67b3bca7 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 a1cd444d..2ed20858 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 3b1780d5..c35655f8 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 0a56ad13..7c741fc4 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 755de10b..640f1575 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 582558f4..a5f36635 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 2d562fc2..5f46e136 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 14e54c64..eb976352 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 b7669745..fb54a7e6 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 9e7c1d9a..066fa22e 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 0d207824..017ebef9 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 72b7c69d..653383b1 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 379f363b..88b407c6 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 095615ab..d049cb4f 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 81a5b4a7..5f991d7c 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
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]