diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-06-21 07:24:54 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-06-21 07:24:54 +0000 |
commit | d2275bbf442d09eb646b388c91a486ba8364ac64 (patch) | |
tree | fd9cb5618cd7c37baeaeab40af354bfff0170523 /src | |
parent | e3e971e7f5010b3ee005970216b8dd8086ca9671 (diff) |
added an option to encrypt when replying to encrypted message.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@357 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
-rw-r--r-- | src/compose.c | 10 | ||||
-rw-r--r-- | src/prefs_account.c | 8 | ||||
-rw-r--r-- | src/prefs_account.h | 4 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/compose.c b/src/compose.c index 24c8bed4..2f1dee05 100644 --- a/src/compose.c +++ b/src/compose.c @@ -781,6 +781,16 @@ void compose_reply(MsgInfo *msginfo, FolderItem *item, ComposeMode mode, compose_connect_changed_callbacks(compose); +#if USE_GPGME + if (account->encrypt_reply && + MSG_IS_ENCRYPTED(compose->replyinfo->flags)) { + GtkItemFactory *ifactory; + + ifactory = gtk_item_factory_from_widget(compose->menubar); + menu_set_active(ifactory, "/Tools/PGP Encrypt", TRUE); + } +#endif + if (prefs_common.auto_exteditor) compose_exec_ext_editor(compose); } diff --git a/src/prefs_account.c b/src/prefs_account.c index f9c98857..b8f8e2cb 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -128,6 +128,7 @@ static struct Compose { static struct Privacy { GtkWidget *default_sign_chkbtn; GtkWidget *default_encrypt_chkbtn; + GtkWidget *encrypt_reply_chkbtn; GtkWidget *ascii_armored_chkbtn; GtkWidget *clearsign_chkbtn; GtkWidget *defaultkey_radiobtn; @@ -363,6 +364,9 @@ static PrefParam param[] = { {"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL, &privacy.default_encrypt_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle}, + {"encrypt_reply", "TRUE", &tmp_ac_prefs.encrypt_reply, P_BOOL, + &privacy.encrypt_reply_chkbtn, + prefs_set_data_from_toggle, prefs_set_toggle}, {"ascii_armored", "FALSE", &tmp_ac_prefs.ascii_armored, P_BOOL, &privacy.ascii_armored_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -1436,6 +1440,7 @@ static void prefs_account_privacy_create(void) GtkWidget *label; GtkWidget *default_sign_chkbtn; GtkWidget *default_encrypt_chkbtn; + GtkWidget *encrypt_reply_chkbtn; GtkWidget *ascii_armored_chkbtn; GtkWidget *clearsign_chkbtn; GtkWidget *defaultkey_radiobtn; @@ -1456,6 +1461,8 @@ static void prefs_account_privacy_create(void) _("Sign message by default")); PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn, _("Encrypt message by default")); + PACK_CHECK_BUTTON (vbox2, encrypt_reply_chkbtn, + _("Encrypt when replying to encrypted message")); PACK_CHECK_BUTTON (vbox2, ascii_armored_chkbtn, _("Use ASCII-armored format for encryption")); PACK_CHECK_BUTTON (vbox2, clearsign_chkbtn, @@ -1519,6 +1526,7 @@ static void prefs_account_privacy_create(void) privacy.default_sign_chkbtn = default_sign_chkbtn; privacy.default_encrypt_chkbtn = default_encrypt_chkbtn; + privacy.encrypt_reply_chkbtn = encrypt_reply_chkbtn; privacy.ascii_armored_chkbtn = ascii_armored_chkbtn; privacy.clearsign_chkbtn = clearsign_chkbtn; privacy.defaultkey_radiobtn = defaultkey_radiobtn; diff --git a/src/prefs_account.h b/src/prefs_account.h index 54521c9d..13848beb 100644 --- a/src/prefs_account.h +++ b/src/prefs_account.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2004 Hiroyuki Yamamoto + * Copyright (C) 1999-2005 Hiroyuki Yamamoto * * 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 @@ -129,6 +129,8 @@ struct _PrefsAccount gboolean default_encrypt; gboolean ascii_armored; gboolean clearsign; + gboolean encrypt_reply; + SignKeyType sign_key; gchar *sign_key_id; #endif /* USE_GPGME */ |