projects
/
claws.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88d81f3
)
Simplify handling of gpg_ask_create_key pref.
author
Andrej Kacian
<ticho@claws-mail.org>
Mon, 11 Jul 2016 22:13:21 +0000
(
00:13
+0200)
committer
Andrej Kacian
<ticho@claws-mail.org>
Mon, 11 Jul 2016 22:13:21 +0000
(
00:13
+0200)
src/plugins/pgpcore/sgpgme.c
patch
|
blob
|
history
diff --git
a/src/plugins/pgpcore/sgpgme.c
b/src/plugins/pgpcore/sgpgme.c
index 90c759a36a1568704e88e486b692622da1cf2e6d..51939ded602630ef500db168247b343e38cd8010 100644
(file)
--- 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) {
"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;
}
}
return;
}
}
@@
-1034,8
+1032,6
@@
again:
}
}
}
}
}
}
- prefs_gpg_get_config()->gpg_ask_create_key = FALSE;
- prefs_gpg_save_config();
gpgme_release(ctx);
}
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);
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)
}
void *sgpgme_data_release_and_get_mem(gpgme_data_t data, size_t *len)