[gnome-keyring/dbus-api] [pkcs11] Move unfinalized stuff out of pkcs11g.h

[Stefan Walter <stefw src gnome org>]

commit 1dbc6744a6df1d22f4dd12486f59b7d8b0437240
Author: Stef Walter <stef memberwebs com>
Date:   Wed Aug 19 04:46:12 2009 +0000

    [pkcs11] Move unfinalized stuff out of pkcs11g.h

 pkcs11/pkcs11g.h                        |   16 ----------------
 pkcs11/pkcs11i.h                        |   21 +++++++++++++++++++++
 pkcs11/secret-store/gck-secret-item.c   |    2 +-
 pkcs11/secret-store/gck-secret-object.c |    2 +-
 pkcs11/secret-store/gck-secret-search.c |    2 +-
 5 files changed, 24 insertions(+), 19 deletions(-)
---
diff --git a/pkcs11/pkcs11g.h b/pkcs11/pkcs11g.h
index 2c0d235..e71d5a5 100644
--- a/pkcs11/pkcs11g.h
+++ b/pkcs11/pkcs11g.h
@@ -105,20 +105,4 @@
 
 #define CKA_GNOME_USES_REMAINING                 (CKA_GNOME + 203)
 
-/* -------------------------------------------------------------------
- * SECRETS
- */
-
-#define CKO_G_COLLECTION                     (CKO_GNOME + 110)
-
-#define CKA_G_LOCKED                         (CKA_GNOME + 210)
-
-#define CKA_G_CREATED                        (CKA_GNOME + 211)
-
-#define CKA_G_MODIFIED                       (CKA_GNOME + 212)
-
-#define CKA_G_FIELDS                         (CKA_GNOME + 213)
-
-#define CKA_G_COLLECTION                     (CKA_GNOME + 214)
-
 #endif /* PKCS11G_H */
diff --git a/pkcs11/pkcs11i.h b/pkcs11/pkcs11i.h
index 6d3cb7f..d1018a3 100644
--- a/pkcs11/pkcs11i.h
+++ b/pkcs11/pkcs11i.h
@@ -63,4 +63,25 @@ typedef CK_G_APPLICATION* CK_G_APPLICATION_PTR;
 
 #define CKR_G_APPLICATION_ID_INVALID             (CKR_GNOME + 10)
 
+
+/* -------------------------------------------------------------------
+ * SECRETS
+ */
+
+#define CKO_G_COLLECTION                     (CKO_GNOME + 110)
+
+#define CKO_G_SEARCH                         (CKO_GNOME + 111)
+
+#define CKA_G_LOCKED                         (CKA_GNOME + 210)
+
+#define CKA_G_CREATED                        (CKA_GNOME + 211)
+
+#define CKA_G_MODIFIED                       (CKA_GNOME + 212)
+
+#define CKA_G_FIELDS                         (CKA_GNOME + 213)
+
+#define CKA_G_COLLECTION                     (CKA_GNOME + 214)
+
+#define CKA_G_MATCHED                        (CKA_GNOME + 215)
+
 #endif /* PKCS11I_H */
diff --git a/pkcs11/secret-store/gck-secret-item.c b/pkcs11/secret-store/gck-secret-item.c
index 48f400d..9fcb12d 100644
--- a/pkcs11/secret-store/gck-secret-item.c
+++ b/pkcs11/secret-store/gck-secret-item.c
@@ -29,7 +29,7 @@
 #include "gck/gck-secret.h"
 #include "gck/gck-transaction.h"
 
-#include "pkcs11/pkcs11g.h"
+#include "pkcs11/pkcs11i.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pkcs11/secret-store/gck-secret-object.c b/pkcs11/secret-store/gck-secret-object.c
index 7b29c0c..074c3cc 100644
--- a/pkcs11/secret-store/gck-secret-object.c
+++ b/pkcs11/secret-store/gck-secret-object.c
@@ -27,7 +27,7 @@
 #include "gck/gck-session.h"
 #include "gck/gck-transaction.h"
 
-#include "pkcs11/pkcs11g.h"
+#include "pkcs11/pkcs11i.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pkcs11/secret-store/gck-secret-search.c b/pkcs11/secret-store/gck-secret-search.c
index 1fd476e..a1995b9 100644
--- a/pkcs11/secret-store/gck-secret-search.c
+++ b/pkcs11/secret-store/gck-secret-search.c
@@ -24,7 +24,7 @@
 #include "gck-secret-fields.h"
 #include "gck-secret-search.h"
 
-#include "pkcs11g.h"
+#include "pkcs11i.h"
 
 #include <glib/gi18n.h>