← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pkcs11/roots-store/gck-roots-module.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:
pkcs11/roots-store/gck-roots-module.c
28
28
#include "gck/gck-file-tracker.h"
29
29
#include "gck/gck-serializable.h"
30
30
 
 
31
#include "egg/egg-error.h"
31
32
#include "egg/egg-openssl.h"
32
33
 
33
34
#include <string.h>
187
188
        /* Read in the public key */
188
189
        if (!g_file_get_contents (path, (gchar**)&data, &n_data, &error)) {
189
190
                g_warning ("couldn't load root certificates: %s: %s",
190
 
                           path, error && error->message ? error->message : "");
 
191
                           path, egg_error_message (error));
191
192
                return;
192
193
        }
193
194