[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-164-g2708956

by Werner Koch cvs at cvs.gnupg.org
Thu Dec 15 22:38:20 CET 2011


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 GNU Privacy Guard".

The branch, master has been updated
       via  27089564b6453deaf7b4ffe7cc5f5f290b6d892b (commit)
      from  b22d62bd1481dfe13d60a6d16b09b9297944f063 (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 27089564b6453deaf7b4ffe7cc5f5f290b6d892b
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 15 21:45:35 2011 +0100

    scd: Prefer application Geldkarte over DINSIG.
    
    * scd/app.c (select_application): Reorder application tests.
    --
    
    Although the DINSIG application is available on most German cards, it
    is in reality not used.  Thus showing the Geldkarte application is
    more desirable for a good user experience.

diff --git a/scd/app.c b/scd/app.c
index 31e56fb..76dc8b4 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -397,11 +397,11 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
     err = app_select_nks (app);
   if (err && is_app_allowed ("p15") && (!name || !strcmp (name, "p15")))
     err = app_select_p15 (app);
-  if (err && is_app_allowed ("dinsig") && (!name || !strcmp (name, "dinsig")))
-    err = app_select_dinsig (app);
   if (err && is_app_allowed ("geldkarte")
       && (!name || !strcmp (name, "geldkarte")))
     err = app_select_geldkarte (app);
+  if (err && is_app_allowed ("dinsig") && (!name || !strcmp (name, "dinsig")))
+    err = app_select_dinsig (app);
   if (err && name)
     err = gpg_error (GPG_ERR_NOT_SUPPORTED);
 
@@ -435,8 +435,8 @@ get_supported_applications (void)
     "openpgp",
     "nks",
     "p15",
-    "dinsig",
     "geldkarte",
+    "dinsig",
     /* Note: "undefined" is not listed here because it needs special
        treatment by the client.  */
     NULL

-----------------------------------------------------------------------

Summary of changes:
 scd/app.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list