diff options
| author | Stef Walter <stef@memberwebs.com> | 2010-08-25 08:14:32 -0500 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2010-08-25 08:14:32 -0500 |
| commit | 9ea8cbd7a7cfee35c723c7a0b24b9b252389a5aa (patch) | |
| tree | fcdad795b71d914ef5d806f0f90edb2211541e34 /tool | |
| parent | a9c7f91915decb9a1c326ae09f4ac64bd462d8b2 (diff) | |
| download | gnome-keyring-9ea8cbd7a7cfee35c723c7a0b24b9b252389a5aa.tar.gz | |
Port gnome-keyring to new gck library.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/Makefile.am | 2 | ||||
| -rw-r--r-- | tool/gkr-tool-import.c | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tool/Makefile.am b/tool/Makefile.am index 9bb405d3..e3252f59 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -17,7 +17,7 @@ gnome_keyring_CFLAGS = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" gnome_keyring_LDADD = \ - $(top_builddir)/gp11/libgp11.la \ + $(top_builddir)/gck/libgck.la \ $(top_builddir)/gcr/libgcr.la \ $(top_builddir)/egg/libegg.la \ $(GTHREAD_LIBS) \ diff --git a/tool/gkr-tool-import.c b/tool/gkr-tool-import.c index 74bbfabb..3c3f4888 100644 --- a/tool/gkr-tool-import.c +++ b/tool/gkr-tool-import.c @@ -25,7 +25,7 @@ #include "gkr-tool.h" -#include "gp11/gp11.h" +#include "gck/gck.h" #include "gcr/gcr-importer.h" @@ -40,26 +40,26 @@ static GOptionEntry import_entries[] = { }; static void -on_imported (GcrImporter *importer, GP11Object *object) +on_imported (GcrImporter *importer, GckObject *object) { - GP11Attributes *attrs; - GP11Attribute *id; + GckAttributes *attrs; + GckAttribute *id; CK_OBJECT_CLASS klass; const gchar *message; GError *err = NULL; gchar *label, *hex; - attrs = gp11_attributes_new_empty (CKA_LABEL, CKA_CLASS, CKA_ID, GP11_INVALID); - if (!gp11_object_get_full (object, attrs, NULL, &err)) { + attrs = gck_attributes_new_empty (CKA_LABEL, CKA_CLASS, CKA_ID, GCK_INVALID); + if (!gck_object_get_full (object, attrs, NULL, &err)) { gkr_tool_handle_error (&err, "couldn't get imported object info"); return; } - if (!gp11_attributes_find_string (attrs, CKA_LABEL, &label)) + if (!gck_attributes_find_string (attrs, CKA_LABEL, &label)) label = g_strdup ("unknown"); - if (!gp11_attributes_find_ulong (attrs, CKA_CLASS, &klass)) + if (!gck_attributes_find_ulong (attrs, CKA_CLASS, &klass)) klass = CKO_DATA; - id = gp11_attributes_find (attrs, CKA_ID); + id = gck_attributes_find (attrs, CKA_ID); switch (klass) { case CKO_CERTIFICATE: @@ -89,8 +89,8 @@ on_imported (GcrImporter *importer, GP11Object *object) g_print ("\tID: %s\n", hex); g_free (hex); } - - gp11_attributes_unref (attrs); + + gck_attributes_unref (attrs); g_free (label); } |