diff options
Diffstat (limited to 'dbus/dbus-keyring.c')
| -rw-r--r-- | dbus/dbus-keyring.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index c5c6a0b5..db432be8 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -399,6 +399,7 @@ _dbus_keyring_reload (DBusKeyring *keyring, int n_keys; int i; long now; + DBusError tmp_error; if (!_dbus_string_init (&contents, _DBUS_INT_MAX)) { @@ -434,14 +435,15 @@ _dbus_keyring_reload (DBusKeyring *keyring, have_lock = TRUE; } - result = _dbus_file_get_contents (&contents, - &keyring->filename); - - if (result != DBUS_RESULT_SUCCESS) + dbus_error_init (&tmp_error); + if (!_dbus_file_get_contents (&contents, + &keyring->filename, + &tmp_error)) { _dbus_verbose ("Failed to load keyring file: %s\n", - dbus_result_to_string (result)); + tmp_error.message); /* continue with empty keyring file, so we recreate it */ + dbus_error_free (&tmp_error); } if (!_dbus_string_validate_ascii (&contents, 0, |