Prefer gtk2 pinentry over qt.

	* doc/pinentry.texi: Fix spelling errors.
	Submitted by Ville Skytt�.

prompt and error.  Make it system modal.  Enlarge the description
field.

        * w32/main.c: Remove all helper functions and use a callback
        to set the dialog items directly.
        (dlg_proc): Set 'result' to -1 to indicate cancel.
        (ok_button_clicked): Adjusted. Set 'result' to the len of
        the PIN to indicate success.

2004-12-22  Timo Schulz  <twoaday@g10code.com>

        * w32/main.c: Remove all helper functions and use a callback
        to set the dialog items directly.
        (dlg_proc): Set 'result' to -1 to indicate cancel.
        (ok_button_clicked): Adjusted. Set 'result' to the len of
        the PIN to indicate success.

* w32/dialog.h, w32/dialog.c, w32/controller.h, w32/controller.c:
Removed

* w32/resource.h, w32/pinentry-w32.rc, w32/main.c, w32/dialog.h
* w32/dialog.c, w32/controller.h, w32/controller.c
* w32/Makefile.am: New.  Based on Timo's work.

* w32/dialog.c, w32/controller.h, w32/controller.c
* w32/Makefile.am: New.  Based on Timo's work.

* assuan-buffer.c (readline): Renamed EOF to ISEOF to avoid
compiler warnings.

* gtk.m4, glib.m4, qt.m4: Fixed for automake 1.9

* autogen.sh (configure_ac): Add --build-w32 option.
* Makefile.am: Support for the W32 pinentry.
* configure.ac: Ditto.  Reformatted some error messages.
Define the usual conditionals for W32.
Check for a couple of more usually required headers.

* pinentry/pinentry.h (sleep) [W32]: New.

* pinentry/pinentry.c: Include langinfo.h only if available.
(pinentry_loop) [DOSISH]: Don't do uid check.

* secmem/util.c [DOSISH]: Disable UID stuff.

2004-12-21  Timo Schulz  <twoaday@g10code.com>

        * pinentrycontroller.c: New.
        * pinentrydialog.c: New.
        * main.c: New.

	* acinclude.m4 (IU_LIB_NCURSES, IU_LIB_CURSES, IU_LIB_TERMCAP):
	Moved to m4/curses.m4.
	(AM_ICONV): Moved to m4/iconv.m4.
	(AM_PATH_GLIB): Moved to m4/glib.m4.
	(QT_FIND_FILE, QT_PATH_MOC, QT_PATH_X, QT_PRINT_PROGRAM,
	QT_CHECK_VERSION, QT_PATH_1_3, QT_PATH, QT_CHECK_COMPILER_FLAG,
	QT_REMOVE_FORBIDDEN, QT_VALIDIFY_CXXFLAGS, QT_CHECK_COMPILERS,
	QT_CHECK_RPATH, QT_CHECK_LIBPTHREAD, QT_CHECK_PTHREAD_OPTION,
	QT_CHECK_THREADING): Move to m4/qt.m4.

m4/
2004-09-27  Marcus Brinkmann  <marcus@g10code.de>

	* curses.m4, glib.m4, gtk.m4, iconv.m4, qt.m4: New files.

	* qt/Makefile.am (pinentry_qt_LDFLAGS): Add $(QT_RPATH).
	Requested by Leo Savernik <l.savernik@aon.at>.

	* gtk+-2/padlock-keyhole.xpm: File removed.
	* gtk+-2/pinentry-gtk-2.c (create_window): Use stock icon.
	* gtk+-2/gtksecentry.h, gtk+-2/gtksecentry.c: Fix copyright notice.

	Submitted by Albrecht Dress albrecht.dress@arcor.de.

	* configure.ac: Invoke AC_PROG_LN_S.
	(PINENTRY_DEFAULT): New variable.  Substitute it.  Fail if no
	default can be determined.
	* Makefile.am (install-exec-local): Install pinentry default link.

	* configure.ac: Check for Gtk+-2.
	* gtk+-2: New directory with gtk+-2 pinentry.
	* gtk+-2/Makefile.am, gtk+-2/gtksecentry.h, gtk+-2/gtksecentry.c,
	gtk+-2/pinentry-gtk-2.c, gtk+-2/padlock-keyhole.xpm: New files.
	* Makefile.am (pinentry_gtk_2): New variable.
	(SUBDIRS): Add pinentry_gtk_2.

	Submitted by Albrecht Dress albrecht.dress@arcor.de.

	* qt/Makefile.am (ncurses_include): Removed
	-I$(top_srcdir)/pinentry ...
	(AM_CPPFLAGS): ... added: -I$(top_srcdir)/pinentry.  Thanks to
	Peter Eisentraut.

	* pinentry/pinentry.c (pinentry_utf8_to_local): Declare INPUT
	const.
	(pinentry_local_to_utf8): Likewise.
	(pinentry_utf8_to_local, pinentry_local_to_utf8): Compile only, if
	either Curses or GTK+ support is enabled.
	* configure.ac: Do also check for libiconv when the GTK+ version
	of pinentry is to be build.  Define PINENTRY_CURSES, PINENTRY_GTK,
	PINENTRY_QT depending on which versions of pinentry should be
	build.

	* acinclude.m4 (QT_CHECK_DIRECT): Removed.
	(QT_PATH_1_3): Do never invoke QT_CHECK_DIRECT.

typedefs and protos.
(secmem_free, secmem_term): Use wipememory2 instead of memset.

	* assuan-inquire.c, assuan-connect.c, assuan-client.c
	* assuan-socket-server.c, assuan-pipe-connect.c
	* assuan-socket-connect.c: Removed.
	* assuan-handler.c (assuan_get_data_fp): Removed.

	* autogen.sh: Added ACLOCAL_FLAGS.

	* qt/main.cpp: Include "pinentry.h", not <pinentry.h>.

	* gtk/gtksecentry.c:
	(gtk_secure_entry_key_press): Treat GDK_KP_Enter just like
	GDK_Return.

	* qt/secqstring.cpp: Do not include "private/qunicodetables_p.h".
	(isRightToLeft): De-optimize direction query.

	* qt/secqinternal_p.h, qt/secqinternal.cpp: New files.
	* qt/Makefile.am (pinentry_qt_SOURCES): Add secqinternal_p.h
	and secqinternal.cpp.
	(EXTRA_DIST): Add README.SecQ.
	* qt/secqlineedit.cpp: Include "secqinternal_p.h".
	(drawContents): Use SecQSharedDoubleBuffer.

(main): Translate the --display option to -display, so that the Qt
init codes can grasp it.
* pinentry/pinentry.c: Added comment.

* doc/pinentry.texi: Cleaned up.
* doc/fdl.texi: Removed.

* pinentry/pinentry.c (pinentry_parse_opts): Make short options work.
(pinentry_utf8_to_local): Pass nl_langinfo to iconv_open.

* pinentry/pinentry.h (struct pinentry): Added LOCALE_ERR.
* gtk/pinentry-gtk.c (button_clicked): Set the LOCAE_ERR flag.
* pinentry/pinentry-curses.c (dialog_run): Ditto.
* pinentry/pinentry.c (cmd_getpin, cms_confirm): Check this flag.
(pinentry_local_to_utf8): Release the correct buffer in the error
case. Print diagnostics.
(pinentry_utf8_to_local): Print diagnostics.

* gtk/pinentry-gtk.c (button_clicked): Use the right value as
input for the conversion.