gnome-keyring r1203 - in trunk: . gp11

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Jul 25 17:33:29 2008
New Revision: 1203
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1203&view=rev

Log:
	* gp11/gp11-module.c: Build fixes. Fixes bug #544407


Modified:
   trunk/ChangeLog
   trunk/gp11/gp11-module.c

Modified: trunk/gp11/gp11-module.c
==============================================================================
--- trunk/gp11/gp11-module.c	(original)
+++ trunk/gp11/gp11-module.c	Fri Jul 25 17:33:29 2008
@@ -193,7 +193,7 @@
 	/* Load the actual module */
 	pv->module = g_module_open (path, 0);
 	if (!pv->module) {
-		g_set_error (err, GP11_ERROR, CKR_GP11_MODULE_PROBLEM,
+		g_set_error (err, GP11_ERROR, (int)CKR_GP11_MODULE_PROBLEM,
 		             "Error loading pkcs11 module: %s", g_module_error ());
 		g_object_unref (mod);
 		return NULL;
@@ -201,7 +201,7 @@
 	
 	/* Get the entry point */
 	if (!g_module_symbol (pv->module, "C_GetFunctionList", (void**)&get_function_list)) {
-		g_set_error (err, GP11_ERROR, CKR_GP11_MODULE_PROBLEM,
+		g_set_error (err, GP11_ERROR, (int)CKR_GP11_MODULE_PROBLEM,
 		             "Invalid pkcs11 module: %s", g_module_error ());
 		g_object_unref (mod);
 		return NULL;
@@ -218,7 +218,7 @@
 	
 	/* Make sure we have a compatible version */
 	if (mod->funcs->version.major != CRYPTOKI_VERSION_MAJOR) {
-		g_set_error (err, GP11_ERROR, CKR_GP11_MODULE_PROBLEM,
+		g_set_error (err, GP11_ERROR, (int)CKR_GP11_MODULE_PROBLEM,
 		             "Incompatible version of pkcs11 module: %d.%d",
 		             (int)mod->funcs->version.major,
 		             (int)mod->funcs->version.minor);