diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tool/gkr-tool-import.c | 1 | ||||
| -rw-r--r-- | tool/gkr-tool.c | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -34,6 +34,9 @@ * daemon/ssh/gkr-ssh-storage.c: Add objects to storage list after storing them. + * tool/gkr-tool-import.c: + * tool/gkr-tool.c: Fix importing of objects from tool. + 2008-08-09 Stef Walter <stef@memberwebs.com> * conifgure.in: diff --git a/tool/gkr-tool-import.c b/tool/gkr-tool-import.c index 123127ab..ceeec596 100644 --- a/tool/gkr-tool-import.c +++ b/tool/gkr-tool-import.c @@ -130,6 +130,7 @@ import_from_file (GP11Session *session, const gchar *filename) attrs = gp11_attributes_new (); gp11_attributes_add_data (attrs, CKA_VALUE, data, n_data); gp11_attributes_add_boolean (attrs, CKA_TOKEN, FALSE); + gp11_attributes_add_ulong (attrs, CKA_CLASS, CKO_GNOME_IMPORT); gp11_attributes_add_boolean (attrs, CKA_GNOME_IMPORT_TOKEN, TRUE); gp11_attributes_add_string (attrs, CKA_GNOME_IMPORT_LABEL, g_basename (filename)); diff --git a/tool/gkr-tool.c b/tool/gkr-tool.c index 663fc65d..df0e3213 100644 --- a/tool/gkr-tool.c +++ b/tool/gkr-tool.c @@ -47,7 +47,7 @@ void gkr_tool_handle_error (GError **error, const gchar *format, ...) va_end(va); } - g_printerr ("gnome-keyring: %s%s%s", + g_printerr ("gnome-keyring: %s%s%s\n", message ? message : "", message && err && err->message ? ": " : "", err && err->message ? err->message : ""); |