← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/dbus/gkd-secret-lock.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-03-22 11:00:39 UTC
  • mfrom: (1.1.60 upstream)
  • Revision ID: james.westby@ubuntu.com-20100322110039-wwp3283t0pz923ld
Tags: 2.92.92git20100322-0ubuntu1
https://launchpad.net/bugs/539180
https://launchpad.net/bugs/525410
https://launchpad.net/bugs/526560
* Upstream git snapshot:
  - "Don't save session keyring to disk".(lp: #539180)
  - better errors handling, fixes a crash (lp: #525410)
  - let "automatically unlock" unlock the keyring (lp: #526560)
* debian/patches/04_remove_assert_on_va_list.patch:
  - the change is in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/dbus/gkd-secret-lock.c
24
24
#include "gkd-secret-lock.h"
25
25
#include "gkd-secret-service.h"
26
26
 
 
27
#include "egg/egg-error.h"
 
28
 
27
29
#include "pkcs11/pkcs11i.h"
28
30
 
29
31
#include <gp11/gp11.h>
46
48
 
47
49
        if (error != NULL) {
48
50
                g_object_unref (session);
49
 
                g_warning ("couldn't search for credential objects: %s", error->message);
 
51
                g_warning ("couldn't search for credential objects: %s", egg_error_message (error));
50
52
                dbus_set_error (derr, DBUS_ERROR_FAILED, "Couldn't lock collection");
51
53
                g_clear_error (&error);
52
54
                return FALSE;
56
58
                cred = GP11_OBJECT (l->data);
57
59
                gp11_object_set_session (cred, session);
58
60
                if (!gp11_object_destroy (cred, &error)) {
59
 
                        g_warning ("couldn't destroy credential object: %s", error->message);
 
61
                        g_warning ("couldn't destroy credential object: %s", egg_error_message (error));
60
62
                        g_clear_error (&error);
61
63
                }
62
64
        }