seahorse r2790 - in trunk: . pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Feb 13 18:47:18 2009
New Revision: 2790
URL: http://svn.gnome.org/viewvc/seahorse?rev=2790&view=rev

Log:
Allow PKCS#11 support to build, and fix build for changes in gnome-keyring.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/pkcs11/seahorse-pkcs11-certificate-props.c
   trunk/pkcs11/seahorse-pkcs11-certificate.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Feb 13 18:47:18 2009
@@ -439,7 +439,7 @@
 	echo "disabling pkcs11 support"
 	enable_pkcs11="no"
 else
-	PKG_CHECK_MODULES(GP11, gp11-0 >= 2.25.5 gcr >= 2.25.5, enable_pkcs11="yes", enable_pkcs11="no")
+	PKG_CHECK_MODULES(GP11, gp11-0 >= 2.25.5 gcr-0 >= 2.25.5, enable_pkcs11="yes", enable_pkcs11="no")
 	if test "$enable_pkcs11" == "yes"; then
 		AC_DEFINE(WITH_PKCS11, 1, [gp11 library available])
 		SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GP11_CFLAGS"

Modified: trunk/pkcs11/seahorse-pkcs11-certificate-props.c
==============================================================================
--- trunk/pkcs11/seahorse-pkcs11-certificate-props.c	(original)
+++ trunk/pkcs11/seahorse-pkcs11-certificate-props.c	Fri Feb 13 18:47:18 2009
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include "seahorse-pkcs11-certificate.h"
 #include "seahorse-pkcs11-certificate-props.h"
 
 #include <gcr/gcr-certificate-basics-widget.h>
@@ -156,14 +157,14 @@
 
 	g_object_class_install_property (gobject_class, PROP_CERTIFICATE,
 	           g_param_spec_object ("certificate", "Certificate", "Certificate to display", 
-	                                SEAHORSE_TYPE_X509_CERT, G_PARAM_READWRITE));
+	                                SEAHORSE_PKCS11_TYPE_CERTIFICATE, G_PARAM_READWRITE));
 }
 
 /* -----------------------------------------------------------------------------
  * PUBLIC 
  */
 
-SeahorsePkcs11CertificateProps*
+GtkDialog*
 seahorse_pkcs11_certificate_props_new (GcrCertificate *cert)
 {
 	return g_object_new (SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS, "certificate", cert, NULL);

Modified: trunk/pkcs11/seahorse-pkcs11-certificate.c
==============================================================================
--- trunk/pkcs11/seahorse-pkcs11-certificate.c	(original)
+++ trunk/pkcs11/seahorse-pkcs11-certificate.c	Fri Feb 13 18:47:18 2009
@@ -39,7 +39,7 @@
 static const gulong REQUIRED_ATTRS[] = {
 	CKA_VALUE,
 	CKA_ID,
-	CKA_GNOME_USER_TRUST,
+	CKA_TRUSTED,
 	CKA_END_DATE
 };
 
@@ -344,19 +344,11 @@
 
 	g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), 0);
 
-	attr = seahorse_pkcs11_object_require_attribute (SEAHORSE_PKCS11_OBJECT (self), CKA_GNOME_USER_TRUST);
-	if (!attr)
-		return SEAHORSE_VALIDITY_UNKNOWN;
-
-	switch (gp11_attribute_get_ulong (attr)) 
-	{
-	case CKT_GNOME_TRUSTED:
+	attr = seahorse_pkcs11_object_require_attribute (SEAHORSE_PKCS11_OBJECT (self), CKA_TRUSTED);
+	if (attr && gp11_attribute_get_boolean (attr))
 		return SEAHORSE_VALIDITY_FULL;
-	case CKT_GNOME_UNTRUSTED:
-		return SEAHORSE_VALIDITY_NEVER;
-	default:
-		return SEAHORSE_VALIDITY_UNKNOWN;
-	}
+
+	return SEAHORSE_VALIDITY_UNKNOWN;
 }
 
 const char*