[git] Pinentry - branch, master, updated. pinentry-0.9.2-31-g25e77c0
by Neal H. Walfield
cvs at cvs.gnupg.org
Mon May 18 09:57:40 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".
The branch, master has been updated
via 25e77c0fd10e9a1d26c31c0a8ec1917b51da5cd2 (commit)
via e89c36a6546515c2a19645356d8f80dd459f2075 (commit)
from edd9a884604ff76e63d238504ede9b118655c55b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 25e77c0fd10e9a1d26c31c0a8ec1917b51da5cd2
Author: Neal H. Walfield <neal at gnu.org>
Date: Mon May 18 09:57:00 2015 +0200
When checking for ncurses, first try using PKG_CHECK_MODULES.
* m4/curses.m4: When checking for ncurses, first try using
PKG_CHECK_MODULES.
--
Patch-By: Alon Bar-Lev
diff --git a/m4/curses.m4 b/m4/curses.m4
index 3a01881..792159c 100644
--- a/m4/curses.m4
+++ b/m4/curses.m4
@@ -28,13 +28,17 @@ AC_DEFUN([IU_LIB_NCURSES], [
AC_ARG_ENABLE(ncurses, [ --disable-ncurses don't prefer -lncurses over -lcurses],
, enable_ncurses=yes)
if test "$enable_ncurses" = yes; then
- AC_CHECK_LIB(ncursesw, initscr, LIBNCURSES="-lncursesw",
- AC_CHECK_LIB(ncurses, initscr, LIBNCURSES="-lncurses"))
- if test "$ac_cv_lib_ncursesw_initscr" = yes; then
- have_ncursesw=yes
- else
- have_ncursesw=no
- fi
+ PKG_CHECK_MODULES([NCURSES], [ncursesw], [LIBNCURSES="${NCURSES_LIBS}" have_ncursesw=yes], [
+ PKG_CHECK_MODULES([NCURSES], [ncurses], [LIBNCURSES="${NCURSES_LIBS}" have_ncursesw=no], [
+ AC_CHECK_LIB(ncursesw, initscr, LIBNCURSES="-lncursesw",
+ AC_CHECK_LIB(ncurses, initscr, LIBNCURSES="-lncurses"))
+ if test "$ac_cv_lib_ncursesw_initscr" = yes; then
+ have_ncursesw=yes
+ else
+ have_ncursesw=no
+ fi
+ ])
+ ])
if test "$LIBNCURSES"; then
# Use ncurses header files instead of the ordinary ones, if possible;
# is there a better way of doing this, that avoids looking in specific
commit e89c36a6546515c2a19645356d8f80dd459f2075
Author: Neal H. Walfield <neal at gnu.org>
Date: Mon May 18 09:52:38 2015 +0200
Purge dead code enabled by ENABLE_ENHANCED.
diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
index e7b9acc..a4ffb44 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -69,10 +69,6 @@ static GtkWidget *entry;
static GtkWidget *repeat_entry;
static GtkWidget *error_label;
static GtkWidget *qualitybar;
-#ifdef ENABLE_ENHANCED
-static GtkWidget *insure;
-static GtkWidget *time_out;
-#endif
static GtkTooltips *tooltips;
static gboolean got_input;
static guint timeout_source;
@@ -189,16 +185,6 @@ button_clicked (GtkWidget *widget, gpointer data)
const char *s, *s2;
/* Okay button or enter used in text field. */
-#ifdef ENABLE_ENHANCED
- /* FIXME: This is not compatible with assuan. We can't just
- print stuff on stdout. */
- /* if (pinentry->enhanced) */
- /* printf ("Options: %s\nTimeout: %d\n\n", */
- /* gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (insure)) */
- /* ? "insure" : "", */
- /* gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (time_out))); */
-#endif
-
s = gtk_secure_entry_get_text (GTK_SECURE_ENTRY (entry));
if (!s)
s = "";
@@ -539,35 +525,6 @@ create_window (pinentry_t ctx, int confirm_mode)
gtk_widget_show (entry);
nrow++;
}
-
-
-#ifdef ENABLE_ENHANCED
- if (pinentry->enhanced)
- {
- GtkWidget *sbox = gtk_hbox_new (FALSE, HIG_SMALL);
- gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
-
- w = gtk_label_new ("Forget secret after");
- gtk_box_pack_start (GTK_BOX (sbox), w, FALSE, FALSE, 0);
- gtk_widget_show (w);
-
- time_out = gtk_spin_button_new
- (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, HUGE_VAL, 1, 60, 60)),
- 2, 0);
- gtk_box_pack_start (GTK_BOX (sbox), time_out, FALSE, FALSE, 0);
- gtk_widget_show (time_out);
-
- w = gtk_label_new ("seconds");
- gtk_box_pack_start (GTK_BOX (sbox), w, FALSE, FALSE, 0);
- gtk_widget_show (w);
- gtk_widget_show (sbox);
-
- insure = gtk_check_button_new_with_label ("ask before giving out "
- "secret");
- gtk_box_pack_start (GTK_BOX (box), insure, FALSE, FALSE, 0);
- gtk_widget_show (insure);
- }
-#endif
}
bbox = gtk_hbutton_box_new ();
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 16b7289..1f57ab5 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -79,9 +79,6 @@ pinentry_reset (int use_defaults)
/* These options are set from the command line. Don't reset
them. */
int debug = pinentry.debug;
-#ifdef ENABLE_ENHANCED
- int enhanced = pinentry.enhanced;
-#endif
char *display = pinentry.display;
int parent_wid = pinentry.parent_wid;
@@ -155,9 +152,6 @@ pinentry_reset (int use_defaults)
pinentry.touch_file = touch_file;
pinentry.debug = debug;
-#ifdef ENABLE_ENHANCED
- pinentry.enhanced = enhanced;
-#endif
pinentry.display = display;
pinentry.parent_wid = parent_wid;
@@ -652,9 +646,6 @@ pinentry_parse_opts (int argc, char *argv[])
ARGPARSE_s_s('N', "ttytype", "|NAME|Set the tty terminal type"),
ARGPARSE_s_s('C', "lc-ctype", "|STRING|Set the tty LC_CTYPE value"),
ARGPARSE_s_s('M', "lc-messages", "|STRING|Set the tty LC_MESSAGES value"),
-#ifdef ENABLE_ENHANCED
- ARGPARSE_s_n('e', "enhanced", "Ask for timeout and insurance, too"),
-#endif
ARGPARSE_s_i('o', "timeout",
"|SECS|Timeout waiting for input after this many seconds"),
ARGPARSE_s_n('g', "no-global-grab",
@@ -676,11 +667,6 @@ pinentry_parse_opts (int argc, char *argv[])
case 'd':
pinentry.debug = 1;
break;
-#ifdef ENABLE_ENHANCED
- case 'e':
- pinentry.enhanced = 1;
- break;
-#endif
case 'g':
pinentry.grab = 0;
break;
diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h
index 19fdb55..a5882bf 100644
--- a/pinentry/pinentry.h
+++ b/pinentry/pinentry.h
@@ -27,8 +27,6 @@ extern "C" {
#endif
#endif
-#undef ENABLE_ENHANCED
-
typedef enum {
PINENTRY_COLOR_NONE, PINENTRY_COLOR_DEFAULT,
PINENTRY_COLOR_BLACK, PINENTRY_COLOR_RED,
@@ -90,11 +88,6 @@ struct pinentry
/* The number of seconds before giving up while waiting for user input. */
int timeout;
-#ifdef ENABLE_ENHANCED
- /* True if enhanced mode is requested. */
- int enhanced;
-#endif
-
/* True if caller should grab the keyboard. (Assuan: "OPTION grab"
or "OPTION no-grab".) */
int grab;
-----------------------------------------------------------------------
Summary of changes:
gtk+-2/pinentry-gtk-2.c | 43 -------------------------------------------
m4/curses.m4 | 18 +++++++++++-------
pinentry/pinentry.c | 14 --------------
pinentry/pinentry.h | 7 -------
4 files changed, 11 insertions(+), 71 deletions(-)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list