Merge branch 'ui-widgets'

1 files changed, 9 insertions, 1 deletions

diff --git a/tool/gkr-tool-import.c b/tool/gkr-tool-import.c
index f9355958..97f37a41 100644
--- a/tool/gkr-tool-import.c
+++ b/tool/gkr-tool-import.c
@@ -103,6 +103,7 @@ int
 gkr_tool_import (int argc, char *argv[])
 {
 	GcrImporter *importer;
+	GcrParser *parser;
 	GError *error = NULL;
 	GInputStream *input;
 	gboolean res;
@@ -134,8 +135,15 @@ gkr_tool_import (int argc, char *argv[])
 			gkr_tool_handle_error (&error, "couldn't read file: %s", *imp);
 			ret = 1;
 		} else {
-			res = gcr_importer_import (importer, input, NULL, &error);
+			parser = gcr_parser_new ();
+			gcr_importer_listen (importer, parser);
+			res = gcr_parser_parse_stream (parser, input, NULL, &error);
 			g_object_unref (input);
+			g_object_unref (parser);
+
+			if (res == TRUE)
+				res = gcr_importer_import (importer, NULL, &error);
+
 			if (res == FALSE) {
 				if (!error || error->code != GCR_ERROR_CANCELLED)
 					gkr_tool_handle_error (&error, "couldn't import file: %s", *imp);