gnome-keyring r1542 - in trunk: . pkcs11/gck

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Feb 10 04:06:50 2009
New Revision: 1542
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1542&view=rev

Log:
Remove two useless unused class members.

Modified:
   trunk/ChangeLog
   trunk/pkcs11/gck/gck-module.c
   trunk/pkcs11/gck/gck-module.h

Modified: trunk/pkcs11/gck/gck-module.c
==============================================================================
--- trunk/pkcs11/gck/gck-module.c	(original)
+++ trunk/pkcs11/gck/gck-module.c	Tue Feb 10 04:06:50 2009
@@ -193,7 +193,7 @@
 	VirtualSlot *slot;
 
 	slot = g_slice_new0 (VirtualSlot);
-	slot->session_manager = g_object_new (klass->manager_type, "for-token", FALSE, NULL);
+	slot->session_manager = g_object_new (GCK_TYPE_MANAGER, "for-token", FALSE, NULL);
 	slot->logged_in = FALSE;
 	slot->sessions = NULL;
 	slot->slot_id = slot_id;
@@ -408,7 +408,7 @@
 gck_module_init (GckModule *self)
 {
 	self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCK_TYPE_MODULE, GckModulePrivate);
-	self->pv->token_manager = g_object_new (GCK_MODULE_GET_CLASS (self)->manager_type, "for-token", TRUE, NULL);
+	self->pv->token_manager = g_object_new (GCK_TYPE_MANAGER, "for-token", TRUE, NULL);
 	self->pv->sessions_by_handle = g_hash_table_new_full (gck_util_ulong_hash, gck_util_ulong_equal, 
 	                                                      gck_util_ulong_free, g_object_unref);
 	self->pv->virtual_slots_by_id = g_hash_table_new_full (gck_util_ulong_hash, gck_util_ulong_equal, 
@@ -516,8 +516,6 @@
 	klass->module_info = &default_module_info;
 	klass->slot_info = &default_slot_info;
 	klass->token_info = &default_token_info;
-	klass->manager_type = GCK_TYPE_MANAGER;
-	klass->session_type = GCK_TYPE_SESSION;
 	
 	klass->parse_argument = gck_module_real_parse_argument;
 	klass->refresh_token = gck_module_real_refresh_token;
@@ -890,7 +888,7 @@
 	/* Make and register a new session */
 	handle = gck_module_next_handle (self);
 	read_only = !(flags & CKF_RW_SESSION);
-	session = g_object_new (GCK_MODULE_GET_CLASS (self)->session_type, "slot-id", slot->slot_id, 
+	session = g_object_new (GCK_TYPE_SESSION, "slot-id", slot->slot_id, 
 	                        "read-only", read_only, "handle", handle, "module", self, 
 	                        "manager", slot->session_manager, "logged-in", slot->logged_in, NULL);
 	slot->sessions = g_list_prepend (slot->sessions, session);

Modified: trunk/pkcs11/gck/gck-module.h
==============================================================================
--- trunk/pkcs11/gck/gck-module.h	(original)
+++ trunk/pkcs11/gck/gck-module.h	Tue Feb 10 04:06:50 2009
@@ -52,8 +52,6 @@
 	const CK_INFO *module_info;
 	const CK_SLOT_INFO *slot_info;
 	const CK_TOKEN_INFO *token_info;
-	GType manager_type;
-	GType session_type;
 	
 	/* virtual methods */