← 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-create.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-create.c
30
30
#include "gkd-secret-types.h"
31
31
#include "gkd-secret-util.h"
32
32
 
 
33
#include "egg/egg-error.h"
33
34
#include "egg/egg-secure-memory.h"
34
35
 
35
36
#include "pkcs11/pkcs11i.h"
303
304
        g_object_unref (cred);
304
305
 
305
306
        if (collection == NULL) {
306
 
                g_warning ("couldn't create collection: %s", error->message);
 
307
                g_warning ("couldn't create collection: %s", egg_error_message (error));
307
308
                g_clear_error (&error);
308
309
                dbus_set_error (derr, DBUS_ERROR_FAILED, "Couldn't create new collection");
309
310
                return FALSE;
314
315
        g_object_unref (collection);
315
316
 
316
317
        if (!identifier) {
317
 
                g_warning ("couldn't lookup new collection identifier: %s", error->message);
 
318
                g_warning ("couldn't lookup new collection identifier: %s", egg_error_message (error));
318
319
                g_clear_error (&error);
319
320
                dbus_set_error (derr, DBUS_ERROR_FAILED, "Couldn't find new collection just created");
320
321
                return FALSE;