diff options
| author | Stef Walter <stef@memberwebs.com> | 2010-11-11 21:52:07 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2010-11-11 21:52:07 +0000 |
| commit | dda1e45061a4a8e02a2bf26be0850431be210f03 (patch) | |
| tree | 8675f85827f431bd69b7f8aa26dabae4a6eba02d /gcr/gcr-trust.c | |
| parent | c71b15445b3f2b1d742969b6ea95bdfea1d729fe (diff) | |
| parent | b5b421b9fd578fe1d56e47fe664a1d8ade0e555e (diff) | |
| download | gcr-dda1e45061a4a8e02a2bf26be0850431be210f03.tar.gz | |
Merge branch 'master' into trust-store
Diffstat (limited to 'gcr/gcr-trust.c')
| -rw-r--r-- | gcr/gcr-trust.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcr/gcr-trust.c b/gcr/gcr-trust.c index 03c04e7..a627987 100644 --- a/gcr/gcr-trust.c +++ b/gcr/gcr-trust.c @@ -193,7 +193,7 @@ perform_get_certificate_exception (GckEnumerator *en, GCancellable *cancel, GErr if (!object) break; - data = gck_object_get_data (object, type, &n_data, error); + data = gck_object_get_data (object, type, NULL, &n_data, error); g_object_unref (object); @@ -380,7 +380,7 @@ perform_set_certificate_exception (GckEnumerator *en, GCancellable *cancel, GErr /* Find an appropriate token */ slot = _gcr_slot_for_storing_trust (error); if (slot != NULL) { - session = gck_slot_open_session (slot, CKF_RW_SESSION, error); + session = gck_slot_open_session (slot, CKF_RW_SESSION, NULL, error); if (session != NULL) { object = gck_session_create_object (session, attrs, cancel, error); |