diff options
| author | Werner Koch <[email protected]> | 2022-02-07 17:04:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-02-07 17:04:10 +0000 |
| commit | 5a7ed6dd8f1b4e3c2e8f6e82700a86bd886c5f50 (patch) | |
| tree | 80a83941a91fe30db4cb004600686fb58483ab5c | |
| parent | gpgconf: Print the used code pages on Windows with --show-configs (diff) | |
| download | gnupg-5a7ed6dd8f1b4e3c2e8f6e82700a86bd886c5f50.tar.gz gnupg-5a7ed6dd8f1b4e3c2e8f6e82700a86bd886c5f50.zip | |
gpgconf: Make gpgconf --launch dirmngr work again
* tools/gpgconf.h (gc_component_id_t): Fix the order.
--
The order has not been adjusted here in 2.2 after we have changed the
order of the gc_components array to have a more logical layout of the
tabs in Gpa and Kleopatra's setting dialogs. In 2.3 everything is
correct, probably because we have another component (keyboxd) there.
| -rw-r--r-- | tools/gpgconf-comp.c | 4 | ||||
| -rw-r--r-- | tools/gpgconf.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 75ba37507..50b93b404 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -619,6 +619,10 @@ static struct } gc_component[GC_COMPONENT_NR] = { + /* Note: The order of the items must match the order given in the + * gc_component_id_t enumeration. The order is often used by + * frontends to display the backend options thus do not change the + * order without considering the user experience. */ { NULL }, /* DUMMY for GC_COMPONENT_ANY */ { GPG_NAME, GPG_DISP_NAME, "gnupg", N_("OpenPGP"), diff --git a/tools/gpgconf.h b/tools/gpgconf.h index 6494a2069..83aee9a09 100644 --- a/tools/gpgconf.h +++ b/tools/gpgconf.h @@ -55,15 +55,15 @@ typedef enum /* The classic GPG for OpenPGP. */ GC_COMPONENT_GPG, + /* GPG for S/MIME. */ + GC_COMPONENT_GPGSM, + /* The GPG Agent. */ GC_COMPONENT_GPG_AGENT, /* The Smardcard Daemon. */ GC_COMPONENT_SCDAEMON, - /* GPG for S/MIME. */ - GC_COMPONENT_GPGSM, - /* The LDAP Directory Manager for CRLs. */ GC_COMPONENT_DIRMNGR, |