/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2007 Hiroyuki Yamamoto & the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2004-2012 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 "defs.h"
-#include "utils.h"
#include "gtk/gtkutils.h"
+#include "utils.h"
#include "prefs.h"
#include "prefs_gtk.h"
#include "prefs_gpg.h"
{"auto_check_signatures", "FALSE",
&prefs_gpg.auto_check_signatures, P_BOOL,
NULL, NULL, NULL},
+ {"autocompletion", "FALSE",
+ &prefs_gpg.autocompletion, P_BOOL,
+ 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},
{"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},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
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_store_passphrase;
GtkWidget *checkbtn_auto_check_signatures;
+ GtkWidget *checkbtn_autocompletion;
GtkWidget *checkbtn_gpg_warning;
GtkWidget *hbox1;
GtkWidget *vbox1, *vbox2;
GtkWidget *label_expire1;
- GtkObject *spinbtn_store_passphrase_adj;
+ GtkAdjustment *spinbtn_store_passphrase_adj;
GtkWidget *spinbtn_store_passphrase;
GtkWidget *label_expire2;
GtkWidget *frame_passphrase;
- GtkTooltips *tooltips;
-
- tooltips = gtk_tooltips_new();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
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,
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_box_pack_start(GTK_BOX(hbox1), spinbtn_store_passphrase, FALSE,
FALSE, 0);
gtk_widget_set_size_request(spinbtn_store_passphrase, 64, -1);
- gtk_tooltips_set_tip(tooltips, spinbtn_store_passphrase,
+ CLAWS_SET_TIP(spinbtn_store_passphrase,
_
- ("Setting to '0' will store the passphrase for the whole session"),
- NULL);
+ ("Setting to '0' will store the passphrase for the whole session"));
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON
(spinbtn_store_passphrase), TRUE);
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_autocompletion), config->autocompletion);
if (!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_gpg_warning), config->gpg_warning);
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;
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 =
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)
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");
+ }
}
}
{
static gchar *path[3];
gchar *rcpath;
- gchar *tmp = NULL;
+ const gchar *tmp = NULL;
prefs_set_default(param);
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
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