[svn] pinentry - r240 - in trunk: . pinentry

[svn author wk]

Author: wk
Date: 2010-10-19 18:46:56 +0200 (Tue, 19 Oct 2010)
New Revision: 240

Modified:
   trunk/ChangeLog
   trunk/pinentry/pinentry.c
Log:
Detect --display=FOO in addition to --display FOO.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-12 15:58:19 UTC (rev 239)
+++ trunk/ChangeLog	2010-10-19 16:46:56 UTC (rev 240)
@@ -1,3 +1,8 @@
+2010-10-19  Werner Koch  <wk at g10code.com>
+
+	* pinentry/pinentry.c (pinentry_have_display): Also detect
+	--display=DISPID.
+
 2010-10-12  Werner Koch  <wk at g10code.com>
 
 	* qt/main.cpp (escape_accel): New.  Adapt from from qt4/.

Modified: trunk/pinentry/pinentry.c
===================================================================
--- trunk/pinentry/pinentry.c	2010-10-12 15:58:19 UTC (rev 239)
+++ trunk/pinentry/pinentry.c	2010-10-19 16:46:56 UTC (rev 240)
@@ -395,7 +395,7 @@
     return 1;
 #endif
   for (; argc; argc--, argv++)
-    if (!strcmp (*argv, "--display"))
+    if (!strcmp (*argv, "--display") || !strncmp (*argv, "--display=", 10))
       return 1;
   return 0;
 }