gnome-keyring r1212 - in trunk: . gp11 pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Aug  3 15:02:25 2008
New Revision: 1212
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1212&view=rev

Log:
	* gp11/gp11-attributes.c:
	* gp11/gp11.h:
	* gp11/gp11.pc.in:
	* pkcs11/Makefile.am: Fine tune GP11 library. Make attribute 
	data be guchar, and install gnome PKCS#11 header. Set proper
	version on the library. 


Modified:
   trunk/ChangeLog
   trunk/gp11/gp11-attributes.c
   trunk/gp11/gp11.h
   trunk/gp11/gp11.pc.in
   trunk/pkcs11/Makefile.am

Modified: trunk/gp11/gp11-attributes.c
==============================================================================
--- trunk/gp11/gp11-attributes.c	(original)
+++ trunk/gp11/gp11-attributes.c	Sun Aug  3 15:02:25 2008
@@ -137,7 +137,7 @@
 	if (!attr->value)
 		return NULL;
 
-	return g_strndup (attr->value, attr->length);
+	return g_strndup ((gchar*)attr->value, attr->length);
 }
 
 GDate*

Modified: trunk/gp11/gp11.h
==============================================================================
--- trunk/gp11/gp11.h	(original)
+++ trunk/gp11/gp11.h	Sun Aug  3 15:02:25 2008
@@ -32,7 +32,7 @@
 
 typedef struct GP11Attribute {
 	gulong type;
-	gpointer value;
+	guchar *value;
 	gulong length;
 } GP11Attribute;
 

Modified: trunk/gp11/gp11.pc.in
==============================================================================
--- trunk/gp11/gp11.pc.in	(original)
+++ trunk/gp11/gp11.pc.in	Sun Aug  3 15:02:25 2008
@@ -8,7 +8,7 @@
 
 Name: gp11
 Description: GObject bindings for PKCS#11
-Version: @GP11_MAJOR@
+Version: @VERSION@
 Requires: glib-2.0
 Libs: -L${libdir} -lgp11
 Cflags: -I${includedir}/gp11

Modified: trunk/pkcs11/Makefile.am
==============================================================================
--- trunk/pkcs11/Makefile.am	(original)
+++ trunk/pkcs11/Makefile.am	Sun Aug  3 15:02:25 2008
@@ -1,9 +1,14 @@
 
-EXTRA_DIST = \
-	pkcs11.h \
+# TODO: Are we sure this is the best location for these headers? 
+incdir = $(includedir)/gp11
+
+inc_HEADERS = \
 	pkcs11g.h \
 	pkcs11n.h 
 
+EXTRA_DIST = \
+	pkcs11.h
+
 # ------------------------------------------------------------------------------
 # The pkcs11 module