~ubuntu-branches/ubuntu/natty/gnome-keyring/natty

« back to all changes in this revision

Viewing changes to gcr/gcr-importer.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-02-16 19:00:06 UTC
  • mfrom: (1.1.58 upstream)
  • Revision ID: james.westby@ubuntu.com-20100216190006-cqpnic4zxlkmmi0o
Tags: 2.29.90git20100218-0ubuntu1
Updated to a git snapshot version

Show diffs side-by-side

added added

removed removed

Lines of Context:
258
258
        } else {
259
259
                
260
260
                if (async) {
261
 
                        gp11_slot_open_session_async (self->pv->slot, CKF_RW_SESSION, 
 
261
                        gp11_slot_open_session_async (self->pv->slot, CKF_RW_SESSION, NULL, NULL,
262
262
                                                      self->pv->cancel, on_open_session, self);
263
263
                } else {
264
 
                        session = gp11_slot_open_session_full (self->pv->slot, CKF_RW_SESSION, 
 
264
                        session = gp11_slot_open_session_full (self->pv->slot, CKF_RW_SESSION, NULL, NULL,
265
265
                                                               self->pv->cancel, &error);
266
266
                        complete_open_session (self, session, error);
267
267
                }