[gnome-keyring/gnome-3-0] gcr: Fix warnings using the importer.

[Stefan Walter <stefw src gnome org>]

commit 39198027cd6f1faae6ea6a8283a7171458b03372
Author: Stef Walter <stefw collabora co uk>
Date:   Mon May 30 12:01:06 2011 +0200

    gcr: Fix warnings using the importer.

 gcr/gcr-importer.c     |    2 +-
 gcr/gcr-parser.c       |    2 +-
 tool/gkr-tool-import.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gcr/gcr-importer.c b/gcr/gcr-importer.c
index 407833c..6657e3c 100644
--- a/gcr/gcr-importer.c
+++ b/gcr/gcr-importer.c
@@ -902,7 +902,7 @@ void
 gcr_importer_listen (GcrImporter *self, GcrParser *parser)
 {
 	g_return_if_fail (GCR_IS_IMPORTER (self));
-	g_return_if_fail (GCR_IS_PARSER (self));
+	g_return_if_fail (GCR_IS_PARSER (parser));
 
 	/* Listen in to the parser */
 	g_signal_connect_object (parser, "parsed", G_CALLBACK (on_parser_parsed), self, 0);
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index ed31f08..1ab990c 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -2127,7 +2127,7 @@ gcr_parser_parse_stream (GcrParser *self, GInputStream *input, GCancellable *can
 	GcrParsing *parsing;
 
 	g_return_val_if_fail (GCR_IS_PARSER (self), FALSE);
-	g_return_val_if_fail (G_IS_INPUT_STREAM (self), FALSE);
+	g_return_val_if_fail (G_IS_INPUT_STREAM (input), FALSE);
 	g_return_val_if_fail (!error || !*error, FALSE);
 
 	parsing = gcr_parsing_new (self, input, cancellable);
diff --git a/tool/gkr-tool-import.c b/tool/gkr-tool-import.c
index f6aa2f2..fdb8e01 100644
--- a/tool/gkr-tool-import.c
+++ b/tool/gkr-tool-import.c
@@ -34,7 +34,7 @@ static gchar **import_files = NULL;
 
 static GOptionEntry import_entries[] = {
 	GKR_TOOL_BASIC_OPTIONS
-	{ G_OPTION_REMAINING, 0, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_FILENAME_ARRAY, &import_files, "Filename", NULL },
+	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &import_files, "Filename", NULL },
 	{ NULL }
 };