errors, errors, errors…
authorVolker Birk <vb@pep.foundation>
Fri, 19 Jan 2018 17:32:36 +0100
changeset 2430c4ea8bad7a03
parent 2429 64e8a527c7d6
child 2431 bb39f94cc033
errors, errors, errors…
src/pEpEngine.h
src/pgp_gpg.c
     1.1 --- a/src/pEpEngine.h	Fri Jan 19 17:26:32 2018 +0100
     1.2 +++ b/src/pEpEngine.h	Fri Jan 19 17:32:36 2018 +0100
     1.3 @@ -37,8 +37,9 @@
     1.4      PEP_INIT_GPGME_INIT_FAILED                      = 0x0111,
     1.5      PEP_INIT_NO_GPG_HOME                            = 0x0112,
     1.6      PEP_INIT_NETPGP_INIT_FAILED                     = 0x0113,
     1.7 -    PEP_CANNOT_DETERMINE_GPG_VERSION                = 0x0114,
     1.8 -    PEP_UNSUPPORTED_GPG_VERSION                     = 0x0115,
     1.9 +    PEP_INIT_CANNOT_DETERMINE_GPG_VERSION           = 0x0114,
    1.10 +    PEP_INIT_UNSUPPORTED_GPG_VERSION                = 0x0115,
    1.11 +    PEP_INIT_CANNOT_CONFIG_GPG_AGENT                = 0x0116,
    1.12  
    1.13      PEP_INIT_SQLITE3_WITHOUT_MUTEX                  = 0x0120,
    1.14      PEP_INIT_CANNOT_OPEN_DB                         = 0x0121,
     2.1 --- a/src/pgp_gpg.c	Fri Jan 19 17:26:32 2018 +0100
     2.2 +++ b/src/pgp_gpg.c	Fri Jan 19 17:32:36 2018 +0100
     2.3 @@ -220,7 +220,7 @@
     2.4  
     2.5  unsupported:
     2.6      free(_s);
     2.7 -    return PEP_UNSUPPORTED_GPG_VERSION;
     2.8 +    return PEP_INIT_UNSUPPORTED_GPG_VERSION;
     2.9  }
    2.10  
    2.11  PEP_STATUS pgp_init(PEP_SESSION session, bool in_first)
    2.12 @@ -274,8 +274,8 @@
    2.13          free_stringlist(conf_values);
    2.14  
    2.15          assert(bResult);
    2.16 -        if(!bResult){
    2.17 -            status = PEP_INIT_NO_GPG_HOME; /* FIXME: Wrong error here? */
    2.18 +        if (!bResult) {
    2.19 +            status = PEP_INIT_CANNOT_CONFIG_GPG_AGENT;
    2.20              goto pep_error;
    2.21          }
    2.22  
    2.23 @@ -299,7 +299,7 @@
    2.24              return PEP_OUT_OF_MEMORY;
    2.25  
    2.26          if (!info->version)
    2.27 -            return PEP_CANNOT_DETERMINE_GPG_VERSION;
    2.28 +            return PEP_INIT_CANNOT_DETERMINE_GPG_VERSION;
    2.29  
    2.30          status = _version_test(info->version);
    2.31          if (status != PEP_STATUS_OK)