[gnome-keyring] [dbus] Add item Type property to secret items.



commit 99dbc776a216d8e6a0b215297e3e3189dd0ea3ed
Author: Stef Walter <stef memberwebs com>
Date:   Mon Jan 4 01:10:06 2010 +0000

    [dbus] Add item Type property to secret items.

 daemon/data/introspect-item.xml   |    1 +
 daemon/dbus/gkd-secret-objects.c  |    1 +
 daemon/dbus/gkd-secret-property.c |    8 ++++++++
 3 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/daemon/data/introspect-item.xml b/daemon/data/introspect-item.xml
index 56d75a2..753025c 100644
--- a/daemon/data/introspect-item.xml
+++ b/daemon/data/introspect-item.xml
@@ -29,6 +29,7 @@
 		<property name="Locked" type="b" access="read"/>
 		<property name="Attributes" type="a{ss}" access="readwrite"/>
 		<property name="Label" type="s" access="readwrite"/>
+		<property name="Type" type="s" access="readwrite"/>
 		<property name="Created" type="t" access="read"/>
 		<property name="Modified" type="t" access="read"/>
 		<method name="Delete">
diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
index dac1152..4c5b5a8 100644
--- a/daemon/dbus/gkd-secret-objects.c
+++ b/daemon/dbus/gkd-secret-objects.c
@@ -306,6 +306,7 @@ item_property_getall (GP11Object *object, DBusMessage *message)
 
 	attrs = gp11_object_get (object, &error,
 	                         CKA_LABEL,
+	                         CKA_G_SCHEMA,
 	                         CKA_G_LOCKED,
 	                         CKA_G_CREATED,
 	                         CKA_G_MODIFIED,
diff --git a/daemon/dbus/gkd-secret-property.c b/daemon/dbus/gkd-secret-property.c
index acd9e56..ecc2d66 100644
--- a/daemon/dbus/gkd-secret-property.c
+++ b/daemon/dbus/gkd-secret-property.c
@@ -71,6 +71,10 @@ property_to_attribute (const gchar *prop_name, CK_ATTRIBUTE_TYPE *attr_type, Dat
 		*attr_type = CKA_LABEL;
 		*data_type = DATA_TYPE_STRING;
 
+	} else if (g_str_equal (prop_name, "Type")) {
+		*attr_type = CKA_G_SCHEMA;
+		*data_type = DATA_TYPE_STRING;
+
 	} else if (g_str_equal (prop_name, "Locked")) {
 		*attr_type = CKA_G_LOCKED;
 		*data_type = DATA_TYPE_BOOL;
@@ -105,6 +109,10 @@ attribute_to_property (CK_ATTRIBUTE_TYPE attr_type, const gchar **prop_name, Dat
 		*prop_name = "Label";
 		*data_type = DATA_TYPE_STRING;
 		break;
+	case CKA_G_SCHEMA:
+		*prop_name = "Type";
+		*data_type = DATA_TYPE_STRING;
+		break;
 	case CKA_G_LOCKED:
 		*prop_name = "Locked";
 		*data_type = DATA_TYPE_BOOL;



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