jaromail

commit a1525a07cb6c365e613ee38ada11e08f9f06c1fa
parent b7eb72f7648975a3b0c5901137d69eb047c54896
Author: Jaromil <jaromil@dyne.org>
Date:   Mon, 13 Oct 2014 16:56:22 +0200

fixes to gnom-keyring to print errors and be detected in new path

Diffstat:
M
src/gnome-keyring/jaro-gnome-keyring.c
 | 
6
++++--
M
src/jaro
 | 
6
+++---

2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/gnome-keyring/jaro-gnome-keyring.c b/src/gnome-keyring/jaro-gnome-keyring.c
@@ -73,6 +73,7 @@ get_password(jaro_credential_t *cred)
 					      "username", cred->username,
 					      NULL);
     if (keyres != GNOME_KEYRING_RESULT_OK) {
+	error("failed to get password: %s", gnome_keyring_result_to_message(keyres));
 	return 1;
     }
     g_printf("%s\n", pass);
@@ -94,6 +95,7 @@ check_password(jaro_credential_t *cred)
 					      "username", cred->username,
 					      NULL);
     if (keyres != GNOME_KEYRING_RESULT_OK) {
+	error("failed to check password: %s", gnome_keyring_result_to_message(keyres));
 	return 1;
     }
     gnome_keyring_free_password(pass);
@@ -122,7 +124,7 @@ store_password(jaro_credential_t *cred)
 					       "username", cred->username,
 					       NULL);
     if (keyres != GNOME_KEYRING_RESULT_OK) {
-	error("failed to store password");
+	error("failed to store password: %s", gnome_keyring_result_to_message(keyres));
 	return 1;
     }
     return 0;
@@ -140,7 +142,7 @@ erase_password(jaro_credential_t *cred)
 						"username", cred->username,
 						NULL);
     if (keyres != GNOME_KEYRING_RESULT_OK) {
-	error("failed to delete password");
+	error("failed to erase password: %s", gnome_keyring_result_to_message(keyres));
 	return 1;
     }
     return 0;
diff --git a/src/jaro b/src/jaro
@@ -272,9 +272,9 @@ MUTTDIR="$MAILDIRS/.mutt"
 
 # use gnome-keyring for passwords on GNU systems
 GNOMEKEY=0
-{ test $GNOME_KEYRING_CONTROL } && {
-    { command -v jaro-gnome-keyring > /dev/null } && { GNOMEKEY=1 }
-}
+[[ -r $WORKDIR/bin/jaro-gnome-keyring ]] && {
+	 act "using gnome-keyring to store secrets"
+	 GNOMEKEY=1 }
 
 
 cleanexit() {