[seahorse] pkcs11: Changes for GCK API cleanup
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] pkcs11: Changes for GCK API cleanup
- Date: Thu, 25 Aug 2011 10:57:23 +0000 (UTC)
commit 324b9f32c574110a780e771b79f555d942778ccb
Author: Stef Walter <stefw collabora co uk>
Date: Thu Aug 25 12:56:51 2011 +0200
pkcs11: Changes for GCK API cleanup
* And update dependency on latest GCR/GCK
configure.ac | 2 +-
pkcs11/seahorse-pkcs11-module.c | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 12c20a8..ccb52aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl MAIN SEAHORSE VERSION (update after release)
AC_INIT(seahorse, 3.1.5)
-GCR_REQUIRED=3.1.4
+GCR_REQUIRED=3.1.5
dnl ****************************************************************************
diff --git a/pkcs11/seahorse-pkcs11-module.c b/pkcs11/seahorse-pkcs11-module.c
index bbe2f0e..74fb254 100644
--- a/pkcs11/seahorse-pkcs11-module.c
+++ b/pkcs11/seahorse-pkcs11-module.c
@@ -36,8 +36,14 @@ seahorse_pkcs11_module_init (void)
SeahorseSource *source;
GList *slots, *s;
GList *modules, *m;
+ GError *error = NULL;
+
+ modules = gck_modules_initialize_registered (NULL, &error);
+ if (error != NULL) {
+ g_warning ("%s", error->message);
+ g_clear_error (&error);
+ }
- modules = gck_modules_initialize_registered ();
for (m = modules; m != NULL; m = g_list_next (m)) {
slots = gck_module_get_slots (m->data, FALSE);
for (s = slots; s; s = g_list_next (s)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]