Warn on unsuccessful gpgme_set_engine_info calls

diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 2aaebf28f335308ec05e48958515d968655c1bd0..dd746196988730bd0b98c63b7d8681b50c21fa35 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -259,8 +259,11 @@ static void prefs_gpg_save_func(PrefsPage *_page)
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_gpg_warning));
        g_free(config->gpg_path);
        config->gpg_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(page->gpg_path)));
-       if (strcmp(config->gpg_path, "") != 0 && access(config->gpg_path, X_OK) != -1)
-               gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, config->gpg_path, NULL);
+       if (strcmp(config->gpg_path, "") != 0 && access(config->gpg_path, X_OK) != -1) {
+               gpgme_error_t err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, config->gpg_path, NULL);
+               if (err != GPG_ERR_NO_ERROR)
+                       g_warning("failed to set crypto engine configuration: %s", gpgme_strerror(err));
+       }
 
        prefs_gpg_enable_agent(config->use_gpg_agent);
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 093d262e432f8cd7bce8d0de769e0fa71d8a7800..c0fbe6a27765c666bcd5d2034037da8dfb01fac8 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -660,12 +660,15 @@ void sgpgme_init()
 {
        gchar *ctype_locale = NULL, *messages_locale = NULL;
        gchar *ctype_utf8_locale = NULL, *messages_utf8_locale = NULL;
+       gpgme_error_t err = 0;
 
        gpgme_engine_info_t engineInfo;
 
        if (strcmp(prefs_gpg_get_config()->gpg_path, "") != 0 &&
            access(prefs_gpg_get_config()->gpg_path, X_OK) != -1)
-               gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP,prefs_gpg_get_config()->gpg_path, NULL);
+               err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, prefs_gpg_get_config()->gpg_path, NULL);
+               if (err != GPG_ERR_NO_ERROR)
+                       g_warning("failed to set crypto engine configuration: %s", gpgme_strerror(err));
 
        if (gpgme_check_version("1.0.0")) {
 #ifdef LC_CTYPE