From ee225b412dc3f28e3c2f167d3c1514ba27d45492 Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Sun, 3 Aug 2008 15:02:25 +0000 Subject: [PATCH] Fine tune GP11 library. Make attribute data be guchar, and install gnome * 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. svn path=/trunk/; revision=1212 --- gp11/gp11-attributes.c | 2 +- gp11/gp11.h | 2 +- gp11/gp11.pc.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gp11/gp11-attributes.c b/gp11/gp11-attributes.c index 6c68ebc..d5039b3 100644 --- a/gp11/gp11-attributes.c +++ b/gp11/gp11-attributes.c @@ -137,7 +137,7 @@ gp11_attribute_get_string (GP11Attribute *attr) if (!attr->value) return NULL; - return g_strndup (attr->value, attr->length); + return g_strndup ((gchar*)attr->value, attr->length); } GDate* diff --git a/gp11/gp11.h b/gp11/gp11.h index 850b18d..90282ba 100644 --- a/gp11/gp11.h +++ b/gp11/gp11.h @@ -32,7 +32,7 @@ typedef struct GP11Mechanism { typedef struct GP11Attribute { gulong type; - gpointer value; + guchar *value; gulong length; } GP11Attribute; diff --git a/gp11/gp11.pc.in b/gp11/gp11.pc.in index 9554c08..b0a812d 100644 --- a/gp11/gp11.pc.in +++ b/gp11/gp11.pc.in @@ -8,7 +8,7 @@ sysconfdir=@sysconfdir@ 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 -- 2.7.4