gnome-keyring r1514 - in trunk: . pkcs11/user-store

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Feb  7 23:23:22 2009
New Revision: 1514
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1514&view=rev

Log:
Call base class in login and logout methods so all the sessions are marked with appropriate
state.

Modified:
   trunk/ChangeLog
   trunk/pkcs11/user-store/gck-user-module.c

Modified: trunk/pkcs11/user-store/gck-user-module.c
==============================================================================
--- trunk/pkcs11/user-store/gck-user-module.c	(original)
+++ trunk/pkcs11/user-store/gck-user-module.c	Sat Feb  7 23:23:22 2009
@@ -189,8 +189,10 @@
 	}
 
 	/* Note that this application logged in */
-	if (rv == CKR_OK)
+	if (rv == CKR_OK) {
 		g_hash_table_insert (self->logged_in_apps, gck_util_ulong_alloc (slot_id), UNUSED_VALUE);
+		rv = GCK_MODULE_CLASS (gck_user_module_parent_class)->login_user (base, slot_id, pin, n_pin);
+	}
 	
 	return rv;
 }
@@ -199,14 +201,19 @@
 gck_user_module_real_logout_user (GckModule *base, CK_SLOT_ID slot_id)
 {
 	GckUserModule *self = GCK_USER_MODULE (base);
+	CK_RV rv;
 	
 	if (!g_hash_table_remove (self->logged_in_apps, &slot_id))
 		return CKR_USER_NOT_LOGGED_IN;
 	
 	if (g_hash_table_size (self->logged_in_apps) > 0)
 		return CKR_OK;
-		
-	return gck_user_storage_lock (self->storage);
+	
+	rv = gck_user_storage_lock (self->storage);
+	if (rv == CKR_OK)
+		rv = GCK_MODULE_CLASS (gck_user_module_parent_class)->logout_user (base, slot_id);
+	
+	return rv;
 }
 
 static GObject*