projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix warnings
[claws.git] / src / prefs_account.c
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 3ab2695dfc5fe4736b20a511843704219663bdf6..c699d6a49aed550dbdeb910fbdd43f4246b5efbf 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -111,7 +111,7 @@ static struct Send {
        GtkWidget *smtp_uid_entry;
        GtkWidget *smtp_pass_entry;
        GtkWidget *pop_bfr_smtp_chkbtn;
-} send;
+} p_send;
 
 static struct Compose {
        GtkWidget *sigpath_entry;
@@ -129,6 +129,7 @@ static struct Privacy {
        GtkWidget *default_encrypt_chkbtn;
        GtkWidget *default_sign_chkbtn;
        GtkWidget *ascii_armored_chkbtn;
+       GtkWidget *clearsign_chkbtn;
        GtkWidget *defaultkey_radiobtn;
        GtkWidget *emailkey_radiobtn;
        GtkWidget *customkey_radiobtn;
@@ -310,33 +311,33 @@ static PrefParam param[] = {
 
        /* Send */
        {"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
-        &send.date_chkbtn,
+        &p_send.date_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
-        &send.msgid_chkbtn,
+        &p_send.msgid_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
-        &send.customhdr_chkbtn,
+        &p_send.customhdr_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
-        &send.smtp_auth_chkbtn,
+        &p_send.smtp_auth_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"smtp_auth_method", "0", &tmp_ac_prefs.smtp_auth_type, P_ENUM,
-        &send.smtp_auth_type_optmenu,
+        &p_send.smtp_auth_type_optmenu,
         prefs_account_smtp_auth_type_set_data_from_optmenu,
         prefs_account_smtp_auth_type_set_optmenu},
 
        {"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
-        &send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &p_send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
        {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
-        &send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &p_send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
 
        {"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
-        &send.pop_bfr_smtp_chkbtn,
+        &p_send.pop_bfr_smtp_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        /* Compose */
@@ -379,6 +380,9 @@ static PrefParam param[] = {
        {"ascii_armored", "FALSE", &tmp_ac_prefs.ascii_armored, P_BOOL,
         &privacy.ascii_armored_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"clearsign", "FALSE", &tmp_ac_prefs.clearsign, P_BOOL,
+        &privacy.clearsign_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
         &privacy.defaultkey_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
@@ -616,7 +620,7 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
        if (prefs_rc_is_readonly(ACCOUNT_RC))
                return ac_prefs;
 
-       debug_print(_("Opening account preferences window...\n"));
+       debug_print("Opening account preferences window...\n");
 
        inc_lock();
 
@@ -698,7 +702,7 @@ static void prefs_account_create(void)
 {
        gint page = 0;
 
-       debug_print(_("Creating account preferences window...\n"));
+       debug_print("Creating account preferences window...\n");
 
        /* create dialog */
        prefs_dialog_create(&dialog);
@@ -1356,17 +1360,16 @@ static void prefs_account_send_create(void)
 
        PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
                _("Authenticate with POP3 before sending"));
-       gtk_widget_set_sensitive(pop_bfr_smtp_chkbtn, FALSE);
 
-       send.date_chkbtn      = date_chkbtn;
-       send.msgid_chkbtn     = msgid_chkbtn;
-       send.customhdr_chkbtn = customhdr_chkbtn;
+       p_send.date_chkbtn      = date_chkbtn;
+       p_send.msgid_chkbtn     = msgid_chkbtn;
+       p_send.customhdr_chkbtn = customhdr_chkbtn;
 
-       send.smtp_auth_chkbtn       = smtp_auth_chkbtn;
-       send.smtp_auth_type_optmenu = optmenu;
-       send.smtp_uid_entry         = smtp_uid_entry;
-       send.smtp_pass_entry        = smtp_pass_entry;
-       send.pop_bfr_smtp_chkbtn    = pop_bfr_smtp_chkbtn;
+       p_send.smtp_auth_chkbtn       = smtp_auth_chkbtn;
+       p_send.smtp_auth_type_optmenu = optmenu;
+       p_send.smtp_uid_entry         = smtp_uid_entry;
+       p_send.smtp_pass_entry        = smtp_pass_entry;
+       p_send.pop_bfr_smtp_chkbtn    = pop_bfr_smtp_chkbtn;
 }
 
 static void prefs_account_compose_create(void)
@@ -1470,6 +1473,7 @@ static void prefs_account_privacy_create(void)
        GtkWidget *default_encrypt_chkbtn;
        GtkWidget *default_sign_chkbtn;
        GtkWidget *ascii_armored_chkbtn;
+       GtkWidget *clearsign_chkbtn;
        GtkWidget *defaultkey_radiobtn;
        GtkWidget *emailkey_radiobtn;
        GtkWidget *customkey_radiobtn;
@@ -1489,7 +1493,9 @@ static void prefs_account_privacy_create(void)
        PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
                           _("Sign message by default"));
        PACK_CHECK_BUTTON (vbox2, ascii_armored_chkbtn,
-                          _("Use ASCII-armored format"));
+                          _("Use ASCII-armored format for encryption"));
+       PACK_CHECK_BUTTON (vbox2, clearsign_chkbtn,
+                          _("Use clear text signature"));
        gtk_signal_connect (GTK_OBJECT (ascii_armored_chkbtn), "toggled",
                            prefs_account_ascii_armored_warning, NULL);
 
@@ -1549,6 +1555,7 @@ static void prefs_account_privacy_create(void)
        privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
        privacy.default_sign_chkbtn    = default_sign_chkbtn;
        privacy.ascii_armored_chkbtn   = ascii_armored_chkbtn;
+       privacy.clearsign_chkbtn       = clearsign_chkbtn;
        privacy.defaultkey_radiobtn    = defaultkey_radiobtn;
        privacy.emailkey_radiobtn      = emailkey_radiobtn;
        privacy.customkey_radiobtn     = customkey_radiobtn;
@@ -2265,6 +2272,11 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_toggle_button_set_active
+                       (GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn), FALSE);
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
@@ -2328,6 +2340,11 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                prefs_account_mailcmd_toggled
                        (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_toggle_button_set_active
+                       (GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn), FALSE);
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
@@ -2393,6 +2410,11 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_toggle_button_set_active
+                       (GTK_TOGGLE_BUTTON(p_send.pop_bfr_smtp_chkbtn), FALSE);
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
@@ -2459,6 +2481,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
+               /* update pop_before_smtp sensitivity */
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, TRUE);
+               
                if (!tmp_ac_prefs.account_name) {
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
Claws Mail