[seahorse] pkcs11: Fix up implementing of GcrCertificate for new gcr version.



commit 8a99ee3f6ca8d662f1a9e286a2badccd17aa4c08
Author: Stef Walter <stefw collabora co uk>
Date:   Wed Apr 27 22:53:57 2011 +0200

    pkcs11: Fix up implementing of GcrCertificate for new gcr version.

 configure.ac                         |    2 +-
 pkcs11/seahorse-pkcs11-certificate.c |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aaf7589..ed5aba1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,7 +468,7 @@ if test "$enable_pkcs11" = "no"; then
 	echo "disabling pkcs11 support"
 	enable_pkcs11="no"
 else
-	PKG_CHECK_MODULES(GCR, $GCR_LIBRARY >= 2.91.2, gcr_is_present="yes", gcr_is_present="no")
+	PKG_CHECK_MODULES(GCR, $GCR_LIBRARY >= 3.0.0, gcr_is_present="yes", gcr_is_present="no")
 	if test "$gcr_is_present" = "no"; then
 		echo "disabling pkcs11 support"
 	fi
diff --git a/pkcs11/seahorse-pkcs11-certificate.c b/pkcs11/seahorse-pkcs11-certificate.c
index baabb27..d5393fc 100644
--- a/pkcs11/seahorse-pkcs11-certificate.c
+++ b/pkcs11/seahorse-pkcs11-certificate.c
@@ -59,8 +59,10 @@ struct _SeahorsePkcs11CertificatePrivate {
 
 static void seahorse_pkcs11_certificate_iface (GcrCertificateIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (SeahorsePkcs11Certificate, seahorse_pkcs11_certificate, SEAHORSE_PKCS11_TYPE_OBJECT, 
-                         G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, seahorse_pkcs11_certificate_iface));
+G_DEFINE_TYPE_WITH_CODE (SeahorsePkcs11Certificate, seahorse_pkcs11_certificate, SEAHORSE_PKCS11_TYPE_OBJECT,
+                         GCR_CERTIFICATE_MIXIN_IMPLEMENT_COMPARABLE ();
+                         G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, seahorse_pkcs11_certificate_iface);
+);
 
 /* -----------------------------------------------------------------------------
  * INTERNAL 
@@ -198,7 +200,7 @@ seahorse_pkcs11_certificate_get_property (GObject *obj, guint prop_id, GValue *v
 		g_value_take_string (value, seahorse_pkcs11_certificate_get_expires_str (self));
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
+		gcr_certificate_mixin_get_property (obj, prop_id, value, pspec);
 		break;
 	}
 }
@@ -258,6 +260,8 @@ seahorse_pkcs11_certificate_class_init (SeahorsePkcs11CertificateClass *klass)
 	g_object_class_install_property (gobject_class, PROP_EXPIRES_STR, 
 	         g_param_spec_string ("expires-str", "expires-str", "expires-str", NULL, 
 	                              G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+
+	gcr_certificate_mixin_class_init (gobject_class);
 }
 
 const guchar*



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]