/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2004-2015 the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#include "claws-features.h"
+#endif
+
#include <gtk/gtk.h>
#include <glib.h>
#include <glib/gi18n.h>
+#include <gtk/filesel.h>
+
#include "defs.h"
-#include "utils.h"
+#include "gtk/gtkutils.h"
+#include "utils.h"
#include "prefs.h"
+#include "prefs_common.h"
#include "prefs_gtk.h"
#include "prefs_gpg.h"
+#include "sgpgme.h"
struct GPGConfig prefs_gpg;
{"auto_check_signatures", "FALSE",
&prefs_gpg.auto_check_signatures, P_BOOL,
NULL, NULL, NULL},
+ {"autocompletion", "FALSE",
+ &prefs_gpg.autocompletion, P_BOOL,
+ NULL, NULL, NULL},
+ {"autocompletion_limit", "0",
+ &prefs_gpg.autocompletion_limit, P_INT,
+ NULL, NULL, NULL},
+ {"use_gpg_agent", "TRUE", &prefs_gpg.use_gpg_agent, P_BOOL,
+ NULL, NULL, NULL},
{"store_passphrase", "FALSE", &prefs_gpg.store_passphrase, P_BOOL,
NULL, NULL, NULL},
{"store_passphrase_timeout", "0",
NULL, NULL, NULL},
{"gpg_warning", "TRUE", &prefs_gpg.gpg_warning, P_BOOL,
NULL, NULL, NULL},
+ {"gpg_ask_create_key", "TRUE", &prefs_gpg.gpg_ask_create_key, P_BOOL,
+ NULL, NULL, NULL},
+ {"skip_encryption_warning", "", &prefs_gpg.skip_encryption_warning, P_STRING,
+ NULL, NULL, NULL},
+ {"gpg_path", "", &prefs_gpg.gpg_path, P_STRING,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
+static gchar *saved_gpg_agent_info = NULL;
+static void gpg_path_browse_cb(GtkWidget *widget, gpointer data);
+
struct GPGPage
{
PrefsPage page;
GtkWidget *checkbtn_auto_check_signatures;
+ GtkWidget *checkbtn_autocompletion;
+ GtkWidget *checkbtn_use_gpg_agent;
GtkWidget *checkbtn_store_passphrase;
GtkWidget *spinbtn_store_passphrase;
GtkWidget *checkbtn_passphrase_grab;
GtkWidget *checkbtn_gpg_warning;
+ GtkWidget *gpg_path;
};
static void prefs_gpg_create_widget_func(PrefsPage *_page,
struct GPGPage *page = (struct GPGPage *) _page;
struct GPGConfig *config;
- /*
- * BEGIN GLADE CODE
- * DO NOT EDIT
- */
- GtkWidget *table;
+ GtkWidget *checkbtn_use_gpg_agent;
GtkWidget *checkbtn_passphrase_grab;
GtkWidget *checkbtn_store_passphrase;
GtkWidget *checkbtn_auto_check_signatures;
+ GtkWidget *checkbtn_autocompletion;
GtkWidget *checkbtn_gpg_warning;
- GtkWidget *label7;
- GtkWidget *label6;
- GtkWidget *label9;
- GtkWidget *label10;
- GtkWidget *hbox1;
- GtkWidget *label11;
- GtkObject *spinbtn_store_passphrase_adj;
+ GtkWidget *hbox1, *hbox2;
+ GtkWidget *vbox1, *vbox2;
+ GtkWidget *label_gpg_path;
+ GtkWidget *label_expire1;
+ GtkAdjustment *spinbtn_store_passphrase_adj;
GtkWidget *spinbtn_store_passphrase;
- GtkWidget *label12;
- GtkTooltips *tooltips;
-
- tooltips = gtk_tooltips_new();
-
- table = gtk_table_new(5, 2, FALSE);
- gtk_widget_show(table);
- gtk_container_set_border_width(GTK_CONTAINER(table), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-
- checkbtn_passphrase_grab = gtk_check_button_new_with_label("");
- gtk_widget_show(checkbtn_passphrase_grab);
- gtk_table_attach(GTK_TABLE(table), checkbtn_passphrase_grab, 0, 1,
- 3, 4, (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- checkbtn_store_passphrase = gtk_check_button_new_with_label("");
- gtk_widget_show(checkbtn_store_passphrase);
- gtk_table_attach(GTK_TABLE(table), checkbtn_store_passphrase, 0, 1,
- 1, 2, (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- checkbtn_auto_check_signatures =
- gtk_check_button_new_with_label("");
- gtk_widget_show(checkbtn_auto_check_signatures);
- gtk_table_attach(GTK_TABLE(table), checkbtn_auto_check_signatures,
- 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- checkbtn_gpg_warning = gtk_check_button_new_with_label("");
- gtk_widget_show(checkbtn_gpg_warning);
- gtk_table_attach(GTK_TABLE(table), checkbtn_gpg_warning, 0, 1, 4,
- 5, (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- label7 = gtk_label_new(_("Store passphrase in memory"));
- gtk_widget_show(label7);
- gtk_table_attach(GTK_TABLE(table), label7, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label7), 0, 0.5);
-
- label6 = gtk_label_new(_("Automatically check signatures"));
- gtk_widget_show(label6);
- gtk_table_attach(GTK_TABLE(table), label6, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5);
-
- label9 =
- gtk_label_new(_("Grab input while entering a passphrase"));
- gtk_widget_show(label9);
- gtk_table_attach(GTK_TABLE(table), label9, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label9), 0, 0.5);
-
- label10 =
- gtk_label_new(_
- ("Display warning on startup if GnuPG doesn't work"));
- gtk_widget_show(label10);
- gtk_table_attach(GTK_TABLE(table), label10, 1, 2, 4, 5,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label10), 0, 0.5);
-
- hbox1 = gtk_hbox_new(FALSE, 8);
- gtk_widget_show(hbox1);
- gtk_table_attach(GTK_TABLE(table), hbox1, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
-
- label11 = gtk_label_new(_("Expire after"));
- gtk_widget_show(label11);
- gtk_box_pack_start(GTK_BOX(hbox1), label11, FALSE, FALSE, 0);
+ GtkWidget *label_expire2;
+ GtkWidget *frame_passphrase;
+ GtkWidget *gpg_path, *gpg_path_btn;
+
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
+ _("Automatically check signatures"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_autocompletion,
+ _("Use keyring for address autocompletion"));
+
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_passphrase, _("Passphrase"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_use_gpg_agent,
+ _("Use gpg-agent to manage passwords"));
+ if (saved_gpg_agent_info == NULL)
+ gtk_widget_set_sensitive(checkbtn_use_gpg_agent, FALSE);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_store_passphrase,
+ _("Store passphrase in memory"));
+
+ SET_TOGGLE_SENSITIVITY_REVERSE(checkbtn_use_gpg_agent, checkbtn_store_passphrase);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ SET_TOGGLE_SENSITIVITY_REVERSE(checkbtn_use_gpg_agent, hbox1);
+
+ label_expire1 = gtk_label_new(_("Expire after"));
+ gtk_widget_show (label_expire1);
+ gtk_box_pack_start (GTK_BOX (hbox1), label_expire1, FALSE, FALSE, 0);
spinbtn_store_passphrase_adj =
- gtk_adjustment_new(1, 0, 1440, 1, 10, 10);
+ GTK_ADJUSTMENT(gtk_adjustment_new(1, 0, 1440, 1, 10, 0));
spinbtn_store_passphrase =
gtk_spin_button_new(GTK_ADJUSTMENT
(spinbtn_store_passphrase_adj), 1, 0);
gtk_widget_show(spinbtn_store_passphrase);
gtk_box_pack_start(GTK_BOX(hbox1), spinbtn_store_passphrase, FALSE,
FALSE, 0);
- gtk_widget_set_size_request(spinbtn_store_passphrase, 64, -2);
- gtk_tooltips_set_tip(tooltips, spinbtn_store_passphrase,
- _
- ("Setting to '0' will store the passphrase for the whole session"),
- NULL);
+ gtk_widget_set_size_request(spinbtn_store_passphrase, 64, -1);
+ CLAWS_SET_TIP(spinbtn_store_passphrase,
+ _("Setting to '0' will store the passphrase for the whole session"));
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON
(spinbtn_store_passphrase), TRUE);
- label12 = gtk_label_new(_("minute(s)"));
- gtk_widget_show(label12);
- gtk_box_pack_start(GTK_BOX(hbox1), label12, TRUE, TRUE, 0);
- gtk_misc_set_alignment(GTK_MISC(label12), 0.0, 0.5);
- /*
- * END GLADE CODE
- */
+ label_expire2 = gtk_label_new(_("minute(s)"));
+ gtk_widget_show(label_expire2);
+ gtk_box_pack_start(GTK_BOX(hbox1), label_expire2, FALSE, FALSE, 0);
+ gtk_misc_set_alignment(GTK_MISC(label_expire2), 0.0, 0.5);
+
+ SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, label_expire1);
+ SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, spinbtn_store_passphrase);
+ SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, label_expire2);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_passphrase_grab,
+ _("Grab input while entering a passphrase"));
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_warning,
+ _("Display warning on start-up if GnuPG doesn't work"));
+
+ hbox2 = gtk_hbox_new(FALSE, 6);
+ label_gpg_path = gtk_label_new(_("Path to GnuPG executable"));
+ gtk_box_pack_start(GTK_BOX(hbox2), label_gpg_path, FALSE, FALSE, 0);
+ gpg_path = gtk_entry_new();
+ gtk_box_pack_start(GTK_BOX(hbox2), gpg_path, TRUE, TRUE, 0);
+ CLAWS_SET_TIP(gpg_path,
+ _("If left blank the location of the GnuPG executable will be automatically determined."));
+ gpg_path_btn = gtkut_get_browse_file_btn(_("Bro_wse"));
+ gtk_box_pack_start(GTK_BOX(hbox2), gpg_path_btn, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(gpg_path_btn), "clicked",
+ G_CALLBACK(gpg_path_browse_cb), gpg_path);
+ pref_set_entry_from_pref(GTK_ENTRY(gpg_path), prefs_gpg.gpg_path);
+
+ gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 0);
+ gtk_widget_show_all(vbox1);
config = prefs_gpg_get_config();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_auto_check_signatures), config->auto_check_signatures);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_store_passphrase), config->store_passphrase);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_autocompletion), config->autocompletion);
+ if (!g_getenv("GPG_AGENT_INFO"))
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_use_gpg_agent), FALSE);
+ else
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_use_gpg_agent), config->use_gpg_agent);
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbtn_use_gpg_agent)))
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_store_passphrase), config->store_passphrase);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_store_passphrase), (float) config->store_passphrase_timeout);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_passphrase_grab), config->passphrase_grab);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_gpg_warning), config->gpg_warning);
+ gtk_entry_set_text(GTK_ENTRY(gpg_path), config->gpg_path);
page->checkbtn_auto_check_signatures = checkbtn_auto_check_signatures;
+ page->checkbtn_autocompletion = checkbtn_autocompletion;
page->checkbtn_store_passphrase = checkbtn_store_passphrase;
page->spinbtn_store_passphrase = spinbtn_store_passphrase;
page->checkbtn_passphrase_grab = checkbtn_passphrase_grab;
page->checkbtn_gpg_warning = checkbtn_gpg_warning;
+ page->checkbtn_use_gpg_agent = checkbtn_use_gpg_agent;
+ page->gpg_path = gpg_path;
+ page->page.widget = vbox1;
+}
+
+static void gpg_path_browse_cb(GtkWidget* widget, gpointer data)
+{
+ gchar *filename;
+ GtkEntry *dest = GTK_ENTRY(data);
+
+ filename = filesel_select_file_open(_("Select GnuPG executable"), NULL);
+ if (!filename)
+ return;
- page->page.widget = table;
+ gtk_entry_set_text(GTK_ENTRY(dest), filename);
+ g_free(filename);
}
static void prefs_gpg_destroy_widget_func(PrefsPage *_page)
config->auto_check_signatures =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_auto_check_signatures));
+ config->autocompletion =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autocompletion));
+ config->use_gpg_agent =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_use_gpg_agent));
config->store_passphrase =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_store_passphrase));
config->store_passphrase_timeout =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_passphrase_grab));
config->gpg_warning =
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);
+
+ prefs_gpg_enable_agent(config->use_gpg_agent);
prefs_gpg_save_config();
}
GtkWidget *key_by_from;
GtkWidget *key_custom;
GtkWidget *keyid;
+ GtkWidget *keyid_label;
+ GtkWidget *new_key_label;
+ GtkWidget *new_key_btn;
+ GtkWidget *new_key_box;
PrefsAccount *account;
};
gboolean active;
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->key_custom));
+ gtk_widget_set_sensitive(GTK_WIDGET(page->keyid_label), active);
gtk_widget_set_sensitive(GTK_WIDGET(page->keyid), active);
if (!active)
gtk_editable_delete_text(GTK_EDITABLE(page->keyid), 0, -1);
}
+static void prefs_gpg_update_sens(struct GPGAccountPage *page)
+{
+ gboolean active;
+ active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->key_custom));
+ if (sgpgme_has_secret_key()) {
+ gtk_widget_hide(page->new_key_box);
+ gtk_widget_set_sensitive(page->key_default, TRUE);
+ gtk_widget_set_sensitive(page->key_by_from, TRUE);
+ gtk_widget_set_sensitive(page->key_custom, TRUE);
+ gtk_widget_set_sensitive(page->keyid, active);
+ gtk_widget_set_sensitive(page->keyid_label, active);
+ } else {
+ gtk_widget_show(page->new_key_box);
+ gtk_widget_set_sensitive(page->key_default, FALSE);
+ gtk_widget_set_sensitive(page->key_by_from, FALSE);
+ gtk_widget_set_sensitive(page->key_custom, FALSE);
+ gtk_widget_set_sensitive(page->keyid, FALSE);
+ gtk_widget_set_sensitive(page->keyid_label, FALSE);
+ }
+}
+
+static void new_key_clicked(GtkWidget *widget, gpointer user_data)
+{
+ struct GPGAccountPage *page = (struct GPGAccountPage *) user_data;
+ sgpgme_create_secret_key(page->account, FALSE);
+ prefs_gpg_update_sens(page);
+}
+
static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
GtkWindow *window,
gpointer data)
PrefsAccount *account = (PrefsAccount *) data;
GPGAccountConfig *config;
- /*** BEGIN GLADE CODE ***/
GtkWidget *vbox;
GtkWidget *frame1;
- GtkWidget *table1;
+ GtkWidget *vbox2;
+ GtkWidget *hbox;
GSList *key_group = NULL;
GtkWidget *key_default;
GtkWidget *key_by_from;
GtkWidget *key_custom;
- GtkWidget *label13;
- GtkWidget *label14;
- GtkWidget *label15;
- GtkWidget *label16;
+ GtkWidget *keyid_label;
GtkWidget *keyid;
+ GtkWidget *image;
+ GtkWidget *new_key_label;
+ GtkWidget *new_key_btn;
+ GtkWidget *new_key_box;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_vbox_new(FALSE, VSPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
gtk_widget_show(vbox);
- frame1 = gtk_frame_new(_("Sign key"));
- gtk_widget_show(frame1);
- gtk_box_pack_start(GTK_BOX(vbox), frame1, FALSE, FALSE, 0);
- gtk_frame_set_label_align(GTK_FRAME(frame1), 0.0, 0.5);
+ vbox2 = gtkut_get_options_frame(vbox, &frame1, _("Sign key"));
- table1 = gtk_table_new(4, 3, FALSE);
- gtk_widget_show(table1);
- gtk_container_add(GTK_CONTAINER(frame1), table1);
- gtk_container_set_border_width(GTK_CONTAINER(table1), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table1), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table1), 4);
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
- key_default = gtk_radio_button_new_with_label(key_group, "");
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_default));
+ key_default = gtk_radio_button_new_with_label(key_group,
+ _("Use default GnuPG key"));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_default));
gtk_widget_show(key_default);
- gtk_table_attach(GTK_TABLE(table1), key_default, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), key_default, FALSE, FALSE, 0);
- key_by_from = gtk_radio_button_new_with_label(key_group, "");
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_by_from));
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
+
+ key_by_from = gtk_radio_button_new_with_label(key_group,
+ _("Select key by your email address"));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_by_from));
gtk_widget_show(key_by_from);
- gtk_table_attach(GTK_TABLE(table1), key_by_from, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), key_by_from, FALSE, FALSE, 0);
+
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
- key_custom = gtk_radio_button_new_with_label(key_group, "");
- key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_custom));
+ key_custom = gtk_radio_button_new_with_label(key_group,
+ _("Specify key manually"));
+ key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_custom));
gtk_widget_show(key_custom);
- gtk_table_attach(GTK_TABLE(table1), key_custom, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label13 = gtk_label_new(_("Use default GnuPG key"));
- gtk_widget_show(label13);
- gtk_table_attach(GTK_TABLE(table1), label13, 1, 3, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label13), 0, 0.5);
-
- label14 = gtk_label_new(_("Select key by your email address"));
- gtk_widget_show(label14);
- gtk_table_attach(GTK_TABLE(table1), label14, 1, 3, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label14), 0, 0.5);
-
- label15 = gtk_label_new(_("Specify key manually"));
- gtk_widget_show(label15);
- gtk_table_attach(GTK_TABLE(table1), label15, 1, 3, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label15), 0, 0.5);
-
- label16 = gtk_label_new(_("User or key ID:"));
- gtk_widget_show(label16);
- gtk_table_attach(GTK_TABLE(table1), label16, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(label16), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(hbox), key_custom, FALSE, FALSE, 0);
+
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
+
+ keyid_label = gtk_label_new(_("User or key ID:"));
+ gtk_widget_show(keyid_label);
+ gtk_label_set_justify(GTK_LABEL(keyid_label), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(hbox), keyid_label, FALSE, FALSE, 0);
keyid = gtk_entry_new();
gtk_widget_show(keyid);
- gtk_table_attach(GTK_TABLE(table1), keyid, 2, 3, 3, 4,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- /*** END GLADE CODE ***/
+ gtk_box_pack_start(GTK_BOX(hbox), keyid, FALSE, FALSE, 0);
config = prefs_gpg_account_get_config(account);
switch (config->sign_key) {
case SIGN_KEY_DEFAULT:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_default), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(keyid), FALSE);
break;
case SIGN_KEY_BY_FROM:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_by_from), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(keyid), FALSE);
break;
case SIGN_KEY_CUSTOM:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_custom), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(keyid_label), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(keyid), TRUE);
break;
}
+ hbox = gtk_hbox_new (FALSE, 5);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+ new_key_box = gtk_hbox_new(FALSE, 6);
+ gtk_widget_show(new_key_box);
+ gtk_box_pack_start(GTK_BOX(hbox), new_key_box, FALSE, FALSE, 0);
+
+ image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING,
+ GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+ gtk_box_pack_start(GTK_BOX(new_key_box), image, FALSE, FALSE, 0);
+ new_key_label = gtk_label_new(
+ _("No secret key found."));
+ gtk_box_pack_start(GTK_BOX(new_key_box), new_key_label, FALSE, FALSE, 0);
+
+ new_key_btn = gtk_button_new_with_label(_("Generate a new key pair"));
+ gtk_widget_show(new_key_btn);
+ gtk_box_pack_start(GTK_BOX(hbox), new_key_btn, FALSE, FALSE, 0);
+
if (config->sign_key_id != NULL)
gtk_entry_set_text(GTK_ENTRY(keyid), config->sign_key_id);
g_signal_connect(G_OBJECT(key_custom), "toggled", G_CALLBACK(key_custom_toggled), page);
+ g_signal_connect(G_OBJECT(new_key_btn), "clicked", G_CALLBACK(new_key_clicked), page);
page->key_default = key_default;
page->key_by_from = key_by_from;
page->key_custom = key_custom;
page->keyid = keyid;
+ page->keyid_label = keyid_label;
+ page->new_key_box = new_key_box;
page->page.widget = vbox;
page->account = account;
+ prefs_gpg_update_sens(page);
}
static void prefs_gpg_account_destroy_widget_func(PrefsPage *_page)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("failed to write GPG configuration to file\n");
+ g_warning("failed to write GPG configuration to file");
prefs_file_close_revert(pfile);
return;
}
- fprintf(pfile->fp, "\n");
-
- prefs_file_close(pfile);
+ if (fprintf(pfile->fp, "\n") < 0) {
+ FILE_OP_ERROR(rcpath, "fprintf");
+ prefs_file_close_revert(pfile);
+ } else
+ prefs_file_close(pfile);
}
struct GPGAccountConfig *prefs_gpg_account_get_config(PrefsAccount *account)
break;
default:
confstr = g_strdup("");
- g_warning("prefs_gpg_account_set_config: bad sign_key val\n");
+ g_warning("prefs_gpg_account_set_config: bad sign_key val");
}
prefs_account_set_privacy_prefs(account, "gpg", confstr);
static struct GPGPage gpg_page;
static struct GPGAccountPage gpg_account_page;
+void prefs_gpg_enable_agent(gboolean enable)
+{
+ if (enable) {
+ if (saved_gpg_agent_info) {
+ g_setenv("GPG_AGENT_INFO",
+ saved_gpg_agent_info, TRUE);
+ debug_print("set GPG_AGENT_INFO=%s\n",
+ saved_gpg_agent_info);
+ } else {
+ debug_print("Can't enable gpg agent (no GPG_AGENT_INFO)\n");
+ }
+ } else {
+ if (saved_gpg_agent_info) {
+ g_unsetenv("GPG_AGENT_INFO");
+ debug_print("unset GPG_AGENT_INFO=%s\n",
+ saved_gpg_agent_info);
+ } else {
+ debug_print("Can't disable gpg agent (no GPG_AGENT_INFO)\n");
+ }
+ }
+}
+
void prefs_gpg_init()
{
static gchar *path[3];
gchar *rcpath;
+ const gchar *tmp = NULL;
prefs_set_default(param);
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
gpg_account_page.page.weight = 30.0;
prefs_account_register_page((PrefsPage *) &gpg_account_page);
+
+ tmp = g_getenv("GPG_AGENT_INFO");
+ if (tmp)
+ saved_gpg_agent_info = g_strdup(tmp);
+
+ prefs_gpg_enable_agent(prefs_gpg_get_config()->use_gpg_agent);
}
void prefs_gpg_done()
{
prefs_gtk_unregister_page((PrefsPage *) &gpg_page);
prefs_account_unregister_page((PrefsPage *) &gpg_account_page);
+ prefs_gpg_enable_agent(TRUE);
+}
+
+gboolean prefs_gpg_should_skip_encryption_warning(const gchar *systemid)
+{
+ gchar **systems = NULL;
+ int i = 0;
+ if (prefs_gpg_get_config()->skip_encryption_warning == NULL)
+ return FALSE;
+ systems = g_strsplit(prefs_gpg_get_config()->skip_encryption_warning,
+ ",", -1);
+ while (systems && systems[i]) {
+ debug_print(" cmp %s %s\n", systems[i], systemid);
+ if (!strcmp(systems[i],systemid)) {
+ g_strfreev(systems);
+ return TRUE;
+ }
+ i++;
+ }
+ g_strfreev(systems);
+ return FALSE;
+}
+
+void prefs_gpg_add_skip_encryption_warning(const gchar *systemid)
+{
+ gchar *tmp = NULL;
+ if (prefs_gpg_get_config()->skip_encryption_warning == NULL)
+ prefs_gpg_get_config()->skip_encryption_warning =
+ g_strdup_printf("%s,", systemid);
+ else if (!prefs_gpg_should_skip_encryption_warning(systemid)) {
+ tmp = g_strdup_printf("%s%s,",
+ prefs_gpg_get_config()->skip_encryption_warning,
+ systemid);
+ g_free(prefs_gpg_get_config()->skip_encryption_warning);
+ prefs_gpg_get_config()->skip_encryption_warning = tmp;
+ }
+ prefs_gpg_save_config();
+}
+
+void prefs_gpg_remove_skip_encryption_warning(const gchar *systemid)
+{
+ gchar **systems = NULL;
+ int i = 0;
+ if (prefs_gpg_get_config()->skip_encryption_warning == NULL)
+ return;
+
+ if (prefs_gpg_should_skip_encryption_warning(systemid)) {
+ systems = g_strsplit(prefs_gpg_get_config()->skip_encryption_warning,
+ ",", -1);
+ g_free(prefs_gpg_get_config()->skip_encryption_warning);
+ prefs_gpg_get_config()->skip_encryption_warning = NULL;
+
+ while (systems && systems[i]) {
+ if (!strcmp(systems[i],systemid)) {
+ i++;
+ continue;
+ }
+ prefs_gpg_add_skip_encryption_warning(systems[i]);
+ i++;
+ }
+
+ g_strfreev(systems);
+ }
+ prefs_gpg_save_config();
+}
+
+gboolean prefs_gpg_auto_check_signatures(void)
+{
+ return prefs_gpg_get_config()->auto_check_signatures;
}
projects / claws.git / blobdiff