* pinentry/pinentry.c (pinentry_utf8_to_local): this. Changed
callers.
(pinentry_local_to_utf8): New.
(cmd_getpin): Convert result back to UTF-8.
* gtk/pinentry-gtk.c (create_utf8_label): New.
(create_window): Use it here to set the prompts.

* gtk/pinentry-gtk.c (enter_callback): Changed argument name to
avoid shadowing warning.
(create_window): Removed unused variable I.
(ok): Not used, commented.

* pinentry/pinentry.c: Include headers for getpid and sleep
prototypes.

* secmem/util.h: Correctly declare functions taking no args.

* gtk/pinentry-gtk.c: Move gtk headers to the top to avoid
compiler warnings about shadowing index etc.

* curses/pinentry-curses.c: Include stdio.h for the printf prototype.

* pinentry/pinentry-curses.c (dialog_switch_pos): Return a value.

* pinentry/pinentry.c (pinentry_have_display): New.
(pinentry_setbufferlen): Must return a value. Fixed documentation.
(usage): Print a question mark as a substitue for the program name.

* gtk/pinentry-gtk.c (main): use it here instead of getenv().
* qt/main.cpp (main): Ditto.

* gpl.texi, fdl.texi: Added these standard files.

value is returned.
* configure.ac: Use -Wall also for C++.

new option --parent-wid=<win-id> (also available via the assuan OPTION command) for creating the dialogs with the right position and transient hints

	Released 0.6.2.

	* configure.ac: Set version number to 0.6.2.
	* NEWS: Add information for 0.6.2.
	* README: Update for release.

	* configure.ac: Add option --enable-fallback-curses and bind it to
	the ncurses check.  Add automake conditional
	BUILD_LIBPINENTRY_CURSES and FALLBACK_CURSES. Add preprocessor
	symbol FALLBACK_CURSES.

	* curses/Makefile.am (AM_CPPFLAGS): Add $(NCURSES_INCLUDE).
	(LDADD): Add ../pinentry/libpinentry-curses.a.
	* curses/pinentry-curses.c: Include "pinentry-curses.h".
	Moved most of the meat to ...
	* pinentry/pinentry-curses.c: ... here.  New file.  Make all
	functions and global variables static.
	(dialog_cmd_handler): Rename to ...
	(curses_cmd_handler): ... this.
	* pinentry/pinentry-curses.h: New file.
	* pinentry/Makefile.am (noinst_LIBRARIES)
	[BUILD_LIBPINENTRY_CURSES]: Add libpinentry-curses.a.
	(libpinentry_curses_a_SOURCES): New target.

	* gtk/Makefile.am (INCLUDES): Moved all to ...
	(AM_CPPFLAGS): ... here.
	[CURSES_FALLBACK]: Define ncurses_include and libcurses.
	(AM_CPPFLAGS): Add $(ncurses_include).
	(LDADD): Add $(libcurses).
	* gtk/pinentry-gtk.c: Rename TIMEOUT to TIME_OUT to avoid conflict
	with curses.h.
	[CURSES_FALLBACK]: Include "pinentry-curses.h".
	(button_clicked): Likewise.
	(create_window): Likewise.
	(cmd_handler): Renamed to ...
	(gtk_cmd_handler): ... this.
	(pinentry_cmd_handler): Set to gtk_cmd_handler.
	(main) [CURSES_FALLBACK]: Initialize GTK+ only if environment
	variable DISPLAY is set, otherwise fall back to curses dialog.

	* pinentry/pinentry.h: Protect against multiple inclusion.

	* gtk/pinentry-gtk.c (create_window): Use ok and cancel value if
	provided.

	* qt/pinentrycontroller.h: New members _ok and _cancel.
	* qt/pinentrycontroller.cpp (registerCommands): Add SETOK and SETCANCEL.
	(assuanOk): New method.
	(assuanCancel): Likewise.

	* curses/pinentry-curses.c (dialog_create): Grok the new ok and
	cancel members to set the pbutton texts, rather than parsing the
	prompt in the confirm case.

	* pinentry/pinentry.h (struct pinentry): Add new members ok and cancel.
	* pinentry/pinentry.c (register_commands): Add new commands SETOK
	and SETCANCEL to set button texts.
	(struct pinentry pinentry): Add initializers for new members.
	(cmd_setok): New function.
	(cmd_setcancel): Likewise.

	* curses/pinentry-curses.c (dialog_create): Add '<' and '>' around
	the user provided button texts.  Replace sizeof by strlen to fix
	size calculation of ok and cancel button.

	* pinentry/pinentry.h (struct pinentry): New variables lc_ctype
	and lc_messages.
	* pinentry/pinentry.c (usage): New options --lc-ctype and
	--lc-messages.
	(pinentry_parse_opts): Likewise.
	(option_handler): Likewise.
	(struct pinentry pinentry): New initializers for new members.

	* curses/pinentry-curses.c (convert_utf8_string): New function.
	(struct dialog): New members ok and cancel.
	(dialog_create): New variables ERR, DESCRIPTION, ERROR, PROMPT,
	OK, and CANCEL.  Initialize them with the localised versions of
	the pinentry strings.  If in confirm mode, split up the prompt at
	'|' and use the values as button texts.  Use localised strings.
	(dialog_switch_pos): Use localised strings.
	(dialog_run): Free dialog strings.

	* acinclude.m4 (AM_ICONV): New check from gettext.
	* configure.ac: Run AM_ICONV if curses pinentry is build.
	Don't check for inttypes.h, don't check size of unsigned int or
	unsigned long.
	(LIBCAP): Move check to interface independent part.