gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Ask GpgME for path to gpg executable for manual key import.

Browse source
This commit is contained in:
Andrej Kacian 2016-05-02 20:54:19 +02:00
parent 37794f6a74
commit 61f7c3c5e7
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/plugins/pgpcore/pgp_viewer.c
View file

@ -67,6 +67,23 @@ static GtkWidget *pgp_get_widget(MimeViewer *_viewer)
return GTK_WIDGET(viewer->textview->vbox);
}
static gchar *_get_gpg_executable_name()
{
gpgme_engine_info_t e;
if (!gpgme_get_engine_info(&e)) {
while (e != NULL) {
if (e->protocol == GPGME_PROTOCOL_OpenPGP
&& e->file_name != NULL) {
debug_print("Found gpg executable: '%s'\n", e->file_name);
return e->file_name;
}
}
}
return NULL;
}
static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
{
GtkTextView *text;
@ -119,7 +136,9 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
}
gpgme_get_key(ctx, sig->fpr, &key, 0);
if (!key) {
gchar *cmd = g_strdup_printf("gpg --no-tty --recv-keys %s", sig->fpr);
gchar *gpgbin = _get_gpg_executable_name();
gchar *cmd = g_strdup_printf("\"%s\" --no-tty --recv-keys %s",
(gpgbin ? gpgbin : "gpg"), sig->fpr);
AlertValue val = G_ALERTDEFAULT;
if (!prefs_common_get_prefs()->work_offline) {
val = alertpanel(_("Key import"),