[Commits] [SCM] claws branch, master, updated. 3.13.2-176-ge454dd8

[ticho at claws-mail.org]

The branch, master has been updated
       via  e454dd8d5642d0d9159a0f7e3e596a471aba2a6a (commit)
      from  88d81f3035e8fe2d760ba7b237550a5d11193720 (commit)

Summary of changes:
 src/plugins/pgpcore/sgpgme.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit e454dd8d5642d0d9159a0f7e3e596a471aba2a6a
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Jul 12 00:13:21 2016 +0200

    Simplify handling of gpg_ask_create_key pref.

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 90c759a..51939de 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -858,8 +858,6 @@ void sgpgme_create_secret_key(PrefsAccount *account, gboolean ask_create)
 				  "Do you want to create a new key pair now?"),
 				  GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
 		if (val == G_ALERTDEFAULT) {
-			prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
-			prefs_gpg_save_config();
 			return;
 		}
 	}
@@ -1034,8 +1032,6 @@ again:
 			}
 		}
 	}
-	prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
-	prefs_gpg_save_config();
 	gpgme_release(ctx);
 }
 
@@ -1073,10 +1069,10 @@ void sgpgme_check_create_key(void)
 	if (prefs_gpg_get_config()->gpg_ask_create_key &&
 	    !sgpgme_has_secret_key()) {
 		sgpgme_create_secret_key(NULL, TRUE);
-	} else {
-		prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
-		prefs_gpg_save_config();
-	}	
+	}
+
+	prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
+	prefs_gpg_save_config();
 }
 
 void *sgpgme_data_release_and_get_mem(gpgme_data_t data, size_t *len)

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


hooks/post-receive
-- 
Claws Mail