gnome-keyring r1482 - in trunk: . gcr pkcs11/gck

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Jan 29 01:34:45 2009
New Revision: 1482
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1482&view=rev

Log:
	* gcr/gcr-simple-certificate.c:
	* pkcs11/gck/gck-data-der.c: Build fixes. 


Modified:
   trunk/ChangeLog
   trunk/gcr/gcr-simple-certificate.c
   trunk/pkcs11/gck/gck-data-der.c

Modified: trunk/gcr/gcr-simple-certificate.c
==============================================================================
--- trunk/gcr/gcr-simple-certificate.c	(original)
+++ trunk/gcr/gcr-simple-certificate.c	Thu Jan 29 01:34:45 2009
@@ -46,7 +46,7 @@
 static void
 gcr_simple_certificate_init (GcrSimpleCertificate *self)
 {
-	self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_CERTIFICATE, GcrSimpleCertificatePrivate);
+	self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SIMPLE_CERTIFICATE, GcrSimpleCertificatePrivate);
 }
 
 static void

Modified: trunk/pkcs11/gck/gck-data-der.c
==============================================================================
--- trunk/pkcs11/gck/gck-data-der.c	(original)
+++ trunk/pkcs11/gck/gck-data-der.c	Thu Jan 29 01:34:45 2009
@@ -606,7 +606,7 @@
 		goto done;
 	}
 			
-	crypted = egg_asn1_read_value (asn, "encryptedData", &n_crypted, egg_secure_realloc);
+	crypted = egg_asn1_read_value (asn, "encryptedData", &n_crypted, (EggAllocator)egg_secure_realloc);
 	if (!crypted)
 		goto done;