bring in Simon Schubert's general GPG clean up patch

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 1dbba1d58d44cb140b961897cb7e3e48b744e4a7..8a586d8daee60e628f490ff1bc5af06d06938ea4 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -181,9 +181,6 @@ static struct Message {
 
 #if USE_GPGME
 static struct Privacy {
-       GtkWidget *checkbtn_default_encrypt;
-        GtkWidget *checkbtn_ascii_armored;
-       GtkWidget *checkbtn_default_sign;
        GtkWidget *checkbtn_auto_check_signatures;
        GtkWidget *checkbtn_gpg_signature_popup;
        GtkWidget *checkbtn_passphrase_grab;
@@ -235,8 +232,6 @@ static void prefs_common_charset_set_optmenu              (PrefParam *pparam);
 static void prefs_common_default_signkey_set_data_from_optmenu
                                                        (PrefParam *pparam);
 static void prefs_common_default_signkey_set_optmenu   (PrefParam *pparam);
-static void prefs_common_ascii_armored_warning(GtkWidget* widget, 
-                                              gpointer unused);
 #endif
 static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam);
 static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam);
@@ -627,15 +622,6 @@ static PrefParam param[] = {
 
 #if USE_GPGME
        /* Privacy */
-       {"default_encrypt", "FALSE", &prefs_common.default_encrypt, P_BOOL,
-        &privacy.checkbtn_default_encrypt,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"ascii_armored", "FALSE", &prefs_common.ascii_armored, P_BOOL,
-        &privacy.checkbtn_ascii_armored,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"default_sign", "FALSE", &prefs_common.default_sign, P_BOOL,
-        &privacy.checkbtn_default_sign,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"auto_check_signatures", "TRUE",
         &prefs_common.auto_check_signatures, P_BOOL,
         &privacy.checkbtn_auto_check_signatures,
@@ -2216,9 +2202,6 @@ static void prefs_privacy_create(void)
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *hbox1;
-       GtkWidget *checkbtn_default_encrypt;
-        GtkWidget *checkbtn_ascii_armored;
-       GtkWidget *checkbtn_default_sign;
        GtkWidget *checkbtn_auto_check_signatures;
        GtkWidget *checkbtn_gpg_signature_popup;
        GtkWidget *checkbtn_passphrase_grab;
@@ -2237,17 +2220,6 @@ static void prefs_privacy_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON (vbox2, checkbtn_default_encrypt,
-                          _("Encrypt message by default"));
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
-                          _("Plain ASCII armored"));
-       gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
-                               prefs_common_ascii_armored_warning, (gpointer)0);
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_default_sign,
-                          _("Sign message by default"));
-
        PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
                           _("Automatically check signatures"));
 
@@ -2282,9 +2254,6 @@ static void prefs_privacy_create(void)
        /* FIXME: disabled because not implemented */
        gtk_widget_set_sensitive(optmenu, FALSE);
 
-       privacy.checkbtn_default_encrypt = checkbtn_default_encrypt;
-        privacy.checkbtn_ascii_armored   = checkbtn_ascii_armored;
-       privacy.checkbtn_default_sign    = checkbtn_default_sign;
        privacy.checkbtn_auto_check_signatures
                                         = checkbtn_auto_check_signatures;
        privacy.checkbtn_gpg_signature_popup
@@ -2339,18 +2308,6 @@ static void prefs_common_default_signkey_set_optmenu(PrefParam *pparam)
        prefs_common_charset_set_data_from_optmenu(pparam);
 #endif
 }
-
-static void prefs_common_ascii_armored_warning(GtkWidget* widget,
-                                              gpointer unused)
-{
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))
-               && gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook))) {
-               alertpanel_message(_("Warning - Privacy/Plain ASCII armored"),
-                       _("Its not recommend to use the old style plain ASCII\n"
-                       "armored mode for encypted messages. It doesn't comply\n"
-                       "with the RFC 3156 - MIME security with OpenPGP."));
-       }
-}
 #endif /* USE_GPGME */
 
 static void prefs_interface_create(void)