2005-09-14 [paul] 1.9.14cvs26

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 8f2293f13d897bb330a1dfcff995a25e44e1a57c..de3ddb305863549808135903cfa6cc2f4fff74b9 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -144,6 +144,7 @@ static struct Compose {
 static struct Privacy {
        GtkWidget *default_privacy_system;
        GtkWidget *default_encrypt_chkbtn;
+       GtkWidget *default_encrypt_reply_chkbtn;
        GtkWidget *default_sign_chkbtn;
        GtkWidget *save_clear_text_chkbtn;
 } privacy;
@@ -373,8 +374,8 @@ static PrefParam param[] = {
         &compose.sigfile_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
-       {"signature_path", "~/"DEFAULT_SIGNATURE, &tmp_ac_prefs.sig_path, P_STRING,
-        &compose.entry_sigpath,
+       {"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,
+        &tmp_ac_prefs.sig_path, P_STRING, &compose.entry_sigpath,
         prefs_set_data_from_entry, prefs_set_entry},
 
        {"auto_signature", "TRUE", &tmp_ac_prefs.auto_sig, P_BOOL,
@@ -416,6 +417,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},
+       {"default_encrypt_reply", "TRUE", &tmp_ac_prefs.default_encrypt_reply, P_BOOL,
+        &privacy.default_encrypt_reply_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
         &privacy.default_sign_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -582,6 +586,7 @@ static void privacy_system_activated(GtkMenuItem *menuitem)
        privacy_enabled = strcmp(system_id, "");
 
        gtk_widget_set_sensitive (privacy.default_encrypt_chkbtn, privacy_enabled);
+       gtk_widget_set_sensitive (privacy.default_encrypt_reply_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.default_sign_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.save_clear_text_chkbtn, privacy_enabled);
 }
@@ -728,7 +733,7 @@ PrefsAccount *prefs_account_new(void)
 
 void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
 {
-       const guchar *p = label;
+       const gchar *p = label;
        gchar *rcpath;
        gint id;
        gchar **strv, **cur;
@@ -744,7 +749,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        g_free(rcpath);
 
        *ac_prefs = tmp_ac_prefs;
-       while (*p && !isdigit(*p)) p++;
+       while (*p && !g_ascii_isdigit(*p)) p++;
        id = atoi(p);
        if (id < 0) g_warning("wrong account id: %d\n", id);
        ac_prefs->account_id = id;
@@ -790,7 +795,7 @@ static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_da
 
        encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
        base64_encode(encvalue, (gchar *) value, strlen(value));
-       g_string_sprintfa(str, "%s=%s", (gchar *) key, encvalue);
+       g_string_append_printf(str, "%s=%s", (gchar *) key, encvalue);
        g_free(encvalue);
 }
 
@@ -870,7 +875,7 @@ void prefs_account_set_privacy_prefs(PrefsAccount *account, gchar *id, gchar *ne
 {
        gchar *orig_key = NULL, *value;
 
-       if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *) &orig_key, (gpointer *) &value)) {
+       if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *)(gchar *) &orig_key, (gpointer *)(gchar *) &value)) {
                g_hash_table_remove(account->privacy_prefs, id);
 
                g_free(orig_key);
@@ -1507,7 +1512,7 @@ static void prefs_account_receive_create(void)
 
        PACK_CHECK_BUTTON
                (vbox1, recvatgetall_chkbtn,
-                _("`Get all' checks for new messages on this account"));
+                _("'Get all' checks for new messages on this account"));
 
        receive.pop3_frame               = frame1;
        receive.use_apop_chkbtn          = use_apop_chkbtn;
@@ -1877,6 +1882,7 @@ static void prefs_account_privacy_create(void)
        GtkWidget *label;
        GtkWidget *default_privacy_system;
        GtkWidget *default_encrypt_chkbtn;
+       GtkWidget *default_encrypt_reply_chkbtn;
        GtkWidget *default_sign_chkbtn;
        GtkWidget *save_clear_text_chkbtn;
 
@@ -1903,6 +1909,9 @@ static void prefs_account_privacy_create(void)
 
        PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
                           _("Encrypt message by default"));
+       PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_chkbtn,
+                          _("Encrypt message by default when replying to an "
+                            "encrypted message"));
        PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
                           _("Sign message by default"));
        PACK_CHECK_BUTTON (vbox2, save_clear_text_chkbtn,
@@ -1910,6 +1919,7 @@ static void prefs_account_privacy_create(void)
 
        privacy.default_privacy_system = default_privacy_system;
        privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
+       privacy.default_encrypt_reply_chkbtn = default_encrypt_reply_chkbtn;
        privacy.default_sign_chkbtn    = default_sign_chkbtn;
        privacy.save_clear_text_chkbtn = save_clear_text_chkbtn;
 }
@@ -2739,7 +2749,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(ssl.pop_frame);
                gtk_widget_hide(ssl.imap_frame);
                gtk_widget_show(ssl.nntp_frame);
-               gtk_widget_hide(ssl.send_frame);
+               gtk_widget_show(ssl.send_frame);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
@@ -3106,7 +3116,7 @@ void prefs_account_register_page(PrefsPage *page)
        prefs_pages = g_slist_append(prefs_pages, page);
 }
 
-void prefs_acount_unregister_page(PrefsPage *page)
+void prefs_account_unregister_page(PrefsPage *page)
 {
        prefs_pages = g_slist_remove(prefs_pages, page);
 }