Fix two memory leaks around use of privacy_get_system_ids().

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 185e24deea28d93976c4745d9ee1613f54391c4f..99343219e2bd0597d53f7e69869a5e052b2fcecd 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -118,6 +118,7 @@ typedef struct BasicPage
        GtkWidget *pass_label;
        GtkWidget *uid_entry;
        GtkWidget *pass_entry;
+       GtkWidget *showpwd_checkbtn;
        GtkWidget *auto_configure_btn;
        GtkWidget *auto_configure_cancel_btn;
        GtkWidget *auto_configure_lbl;
@@ -366,6 +367,8 @@ static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
                                           gpointer user_data);
 static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
                                          gpointer user_data);
+static void prefs_account_showpwd_checkbtn_toggled(GtkToggleButton *button,
+                                         gpointer user_data);
 static void prefs_account_filter_on_recv_toggled(GtkToggleButton *button,
                                          gpointer user_data);
 
@@ -959,7 +962,10 @@ static void update_privacy_system_menu() {
                                COMBOBOX_SENS, TRUE,
                                COMBOBOX_PRIVACY_PLUGIN_ID, id,
                                -1);
+               g_free(id);
        }
+       g_slist_free(system_ids);
+
 }
 
 #define TABLE_YPAD 2
@@ -1010,6 +1016,7 @@ static void basic_create_widget_func(PrefsPage * _page,
        GtkWidget *auto_configure_btn;
        GtkWidget *auto_configure_cancel_btn;
        GtkWidget *auto_configure_lbl;
+       GtkWidget *showpwd_checkbtn;
        GtkListStore *menu;
        GtkTreeIter iter;
        gchar *buf;
@@ -1153,7 +1160,7 @@ static void basic_create_widget_func(PrefsPage * _page,
        protocol_optmenu->no_imap_warn_icon = no_imap_warn_icon;
        protocol_optmenu->no_imap_warn_label = no_imap_warn_label;
 
-       serv_table = gtk_table_new (6, 4, FALSE);
+       serv_table = gtk_table_new (10, 4, FALSE);
        gtk_widget_show (serv_table);
        gtk_box_pack_start (GTK_BOX (vbox2), serv_table, FALSE, FALSE, 0);
        gtk_table_set_row_spacings (GTK_TABLE (serv_table), VSPACING_NARROW);
@@ -1288,10 +1295,20 @@ static void basic_create_widget_func(PrefsPage * _page,
        gtk_table_attach (GTK_TABLE (serv_table), pass_label, 0, 1, 8, 9,
                          GTK_FILL, 0, 0, 0);
 #endif
+
+       showpwd_checkbtn = gtk_check_button_new_with_label (_("Show password"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showpwd_checkbtn), FALSE);
+       gtk_widget_show(showpwd_checkbtn);
+       gtk_table_attach (GTK_TABLE (serv_table), showpwd_checkbtn, 3, 4, 9, 10,
+                       GTK_FILL, 0, 0, 0);
+       g_signal_connect(G_OBJECT(showpwd_checkbtn), "toggled",
+                       G_CALLBACK(prefs_account_showpwd_checkbtn_toggled), pass_entry);
+
        SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, uid_label);
        SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, pass_label);
        SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, uid_entry);
        SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, pass_entry);
+       SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, showpwd_checkbtn);
        SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, nntpauth_onconnect_checkbtn);
 
        page->acname_entry   = acname_entry;
@@ -1321,6 +1338,7 @@ static void basic_create_widget_func(PrefsPage * _page,
        page->pass_label       = pass_label;
        page->uid_entry        = uid_entry;
        page->pass_entry       = pass_entry;
+       page->showpwd_checkbtn = showpwd_checkbtn;
        page->auto_configure_btn = auto_configure_btn;
        page->auto_configure_cancel_btn = auto_configure_cancel_btn;
        page->auto_configure_lbl = auto_configure_lbl;
@@ -1703,6 +1721,7 @@ static void send_create_widget_func(PrefsPage * _page,
        GtkWidget *checkbtn_msgid_with_addr;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_checkbtn;
+       GtkWidget *showpwd_checkbtn;
        GtkWidget *optmenu;
        GtkListStore *menu;
        GtkTreeIter iter;
@@ -1823,8 +1842,15 @@ static void send_create_widget_func(PrefsPage * _page,
        gtk_widget_show (smtp_pass_entry);
        gtk_widget_set_size_request (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
        gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
-
        gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
+
+       showpwd_checkbtn = gtk_check_button_new_with_label (_("Show password"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showpwd_checkbtn), FALSE);
+       gtk_widget_show(showpwd_checkbtn);
+       gtk_box_pack_start(GTK_BOX (hbox), showpwd_checkbtn, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(showpwd_checkbtn), "toggled",
+                       G_CALLBACK(prefs_account_showpwd_checkbtn_toggled), smtp_pass_entry);
+
        PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
 
        hbox = gtk_hbox_new (FALSE, 8);
@@ -2436,6 +2462,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
        GtkWidget *cert_table;
        GtkWidget *entry_in_cert_pass;
        GtkWidget *entry_out_cert_pass;
+       GtkWidget *showpwd_checkbtn;
 
        GtkWidget *vbox7;
        GtkWidget *ssl_certs_auto_accept_checkbtn;
@@ -2536,9 +2563,15 @@ static void ssl_create_widget_func(PrefsPage * _page,
        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
        entry_in_cert_pass = gtk_entry_new();
        gtk_entry_set_visibility(GTK_ENTRY(entry_in_cert_pass), FALSE);
+       showpwd_checkbtn = gtk_check_button_new_with_label (_("Show password"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showpwd_checkbtn), FALSE);
+       g_signal_connect(G_OBJECT(showpwd_checkbtn), "toggled",
+                       G_CALLBACK(prefs_account_showpwd_checkbtn_toggled), entry_in_cert_pass);
        gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
        gtk_table_attach(GTK_TABLE(cert_table), entry_in_cert_pass, 1, 2, 1, 2,
                         GTK_FILL, 0, 0, 0);
+       gtk_table_attach(GTK_TABLE(cert_table), showpwd_checkbtn, 2, 3, 1, 2,
+                       GTK_FILL, 0, 0, 0);
 
        label = gtk_label_new(_("Certificate for sending"));
        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
@@ -2558,9 +2591,16 @@ static void ssl_create_widget_func(PrefsPage * _page,
        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
        entry_out_cert_pass = gtk_entry_new();
        gtk_entry_set_visibility(GTK_ENTRY(entry_out_cert_pass), FALSE);
+       showpwd_checkbtn = gtk_check_button_new_with_label (_("Show password"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showpwd_checkbtn), FALSE);
+       g_signal_connect(G_OBJECT(showpwd_checkbtn), "toggled",
+                       G_CALLBACK(prefs_account_showpwd_checkbtn_toggled), entry_out_cert_pass);
        gtk_table_attach(GTK_TABLE(cert_table), label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
        gtk_table_attach(GTK_TABLE(cert_table), entry_out_cert_pass, 1, 2, 3, 4,
                         GTK_FILL, 0, 0, 0);
+       gtk_table_attach(GTK_TABLE(cert_table), showpwd_checkbtn, 2, 3, 3, 4,
+                       GTK_FILL, 0, 0, 0);
+
        gtk_widget_show_all(cert_table);
 
        g_signal_connect(G_OBJECT(in_ssl_cert_browse_button), "clicked",
@@ -3537,20 +3577,31 @@ PrefsAccount *prefs_account_new(void)
        return ac_prefs;
 }
 
-void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
+PrefsAccount *prefs_account_new_from_config(const gchar *label)
 {
        const gchar *p = label;
        gchar *rcpath;
        gint id;
        gchar **strv, **cur;
        gsize len;
+       PrefsAccount *ac_prefs;
 
-       cm_return_if_fail(ac_prefs != NULL);
-       cm_return_if_fail(label != NULL);
+       cm_return_val_if_fail(label != NULL, NULL);
+
+       ac_prefs = g_new0(PrefsAccount, 1);
 
+       /* Load default values to tmp_ac_prefs first, ... */
        memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
-       tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
+       prefs_set_default(basic_param);
+       prefs_set_default(receive_param);
+       prefs_set_default(send_param);
+       prefs_set_default(compose_param);
+       prefs_set_default(templates_param);
+       prefs_set_default(privacy_param);
+       prefs_set_default(ssl_param);
+       prefs_set_default(advanced_param);
 
+       /* ... overriding them with values from stored config file. */
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
        prefs_read_config(basic_param, label, rcpath, NULL);
        prefs_read_config(receive_param, label, rcpath, NULL);
@@ -3563,11 +3614,14 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        g_free(rcpath);
 
        *ac_prefs = tmp_ac_prefs;
+
        while (*p && !g_ascii_isdigit(*p)) p++;
        id = atoi(p);
        if (id < 0) g_warning("wrong account id: %d", id);
        ac_prefs->account_id = id;
 
+       /* Now parse privacy_prefs. */
+       ac_prefs->privacy_prefs = g_hash_table_new(g_str_hash, g_str_equal);
        if (privacy_prefs != NULL) {
                strv = g_strsplit(privacy_prefs, ",", 0);
                for (cur = strv; *cur != NULL; cur++) {
@@ -3590,6 +3644,8 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
                privacy_prefs = NULL;
        }
 
+       /* For older configurations, move stored passwords into the
+        * password store. */
        gboolean passwords_migrated = FALSE;
 
        if (ac_prefs->passwd != NULL && strlen(ac_prefs->passwd) > 1) {
@@ -3615,14 +3671,16 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
                passwords_migrated = TRUE;
        }
 
-       /* Write out password store to file immediately after their move
-        * from accountrc there. */
+       /* Write out password store to file immediately, to prevent
+        * their loss. */
        if (passwords_migrated)
                passwd_store_write_config();
 
        ac_prefs->receive_in_progress = FALSE;
 
        prefs_custom_header_read_config(ac_prefs);
+
+       return ac_prefs;
 }
 
 static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_data)
@@ -3882,7 +3940,7 @@ static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
        FolderItem *item;
        gchar *id;
 
-       item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
+       item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE, NULL);
        if (item && item->path) {
                id = folder_item_get_identifier(item);
                if (id) {
@@ -3982,7 +4040,7 @@ static void auto_configure_cb (GtkWidget *widget, gpointer data)
        send_data->set_port = GTK_TOGGLE_BUTTON(advanced_page.smtpport_checkbtn);
        send_data->port = GTK_SPIN_BUTTON(advanced_page.smtpport_spinbtn);
        send_data->tls_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.smtp_starttls_radiobtn);
-       send_data->ssl_checkbtn = NULL;
+       send_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.smtp_ssltunnel_radiobtn);
        send_data->default_port = 25;
        send_data->default_ssl_port = -1;
        send_data->uid_entry = NULL;
@@ -4353,6 +4411,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_show(basic_page.pass_label);
                gtk_widget_show(basic_page.uid_entry);
                gtk_widget_show(basic_page.pass_entry);
+               gtk_widget_show(basic_page.showpwd_checkbtn);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
                                           7, VSPACING_NARROW);
 
@@ -4360,6 +4419,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_set_sensitive(basic_page.pass_label, TRUE);
                gtk_widget_set_sensitive(basic_page.uid_entry,  TRUE);
                gtk_widget_set_sensitive(basic_page.pass_entry, TRUE);
+               gtk_widget_set_sensitive(basic_page.showpwd_checkbtn, TRUE);
 
                /* update userid/passwd sensitive state */
 
@@ -4452,6 +4512,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(basic_page.pass_label);
                gtk_widget_hide(basic_page.uid_entry);
                gtk_widget_hide(basic_page.pass_entry);
+               gtk_widget_hide(basic_page.showpwd_checkbtn);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
                                           7, 0);
 
@@ -4459,6 +4520,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_set_sensitive(basic_page.pass_label, TRUE);
                gtk_widget_set_sensitive(basic_page.uid_entry,  TRUE);
                gtk_widget_set_sensitive(basic_page.pass_entry, TRUE);
+               gtk_widget_set_sensitive(basic_page.showpwd_checkbtn, TRUE);
                gtk_widget_hide(receive_page.pop3_frame);
                gtk_widget_hide(receive_page.imap_frame);
                gtk_widget_show(receive_page.local_frame);
@@ -4558,6 +4620,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_show(basic_page.pass_label);
                gtk_widget_show(basic_page.uid_entry);
                gtk_widget_show(basic_page.pass_entry);
+               gtk_widget_show(basic_page.showpwd_checkbtn);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
                                           7, VSPACING_NARROW);
 
@@ -4565,6 +4628,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_set_sensitive(basic_page.pass_label, TRUE);
                gtk_widget_set_sensitive(basic_page.uid_entry,  TRUE);
                gtk_widget_set_sensitive(basic_page.pass_entry, TRUE);
+               gtk_widget_set_sensitive(basic_page.showpwd_checkbtn, TRUE);
                gtk_widget_hide(receive_page.pop3_frame);
                gtk_widget_show(receive_page.imap_frame);
                gtk_widget_hide(receive_page.local_frame);
@@ -4658,6 +4722,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(basic_page.pass_label);
                gtk_widget_hide(basic_page.uid_entry);
                gtk_widget_hide(basic_page.pass_entry);
+               gtk_widget_hide(basic_page.showpwd_checkbtn);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
                                           7, VSPACING_NARROW);
 
@@ -4665,6 +4730,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_set_sensitive(basic_page.pass_label, FALSE);
                gtk_widget_set_sensitive(basic_page.uid_entry,  FALSE);
                gtk_widget_set_sensitive(basic_page.pass_entry, FALSE);
+               gtk_widget_set_sensitive(basic_page.showpwd_checkbtn, FALSE);
                gtk_widget_set_sensitive(receive_page.pop3_frame, FALSE);
                gtk_widget_hide(receive_page.pop3_frame);
                gtk_widget_hide(receive_page.imap_frame);
@@ -4755,6 +4821,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_show(basic_page.pass_label);
                gtk_widget_show(basic_page.uid_entry);
                gtk_widget_show(basic_page.pass_entry);
+               gtk_widget_show(basic_page.showpwd_checkbtn);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
                                           7, VSPACING_NARROW);
 
@@ -4762,6 +4829,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_set_sensitive(basic_page.pass_label, TRUE);
                gtk_widget_set_sensitive(basic_page.uid_entry,  TRUE);
                gtk_widget_set_sensitive(basic_page.pass_entry, TRUE);
+               gtk_widget_set_sensitive(basic_page.showpwd_checkbtn, TRUE);
                gtk_widget_set_sensitive(receive_page.pop3_frame, TRUE);
                gtk_widget_show(receive_page.pop3_frame);
                gtk_widget_hide(receive_page.imap_frame);
@@ -4830,6 +4898,7 @@ static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
        gtk_widget_set_sensitive(basic_page.pass_label, auth);
        gtk_widget_set_sensitive(basic_page.uid_entry,  auth);
        gtk_widget_set_sensitive(basic_page.pass_entry, auth);
+       gtk_widget_set_sensitive(basic_page.showpwd_checkbtn, auth);
        gtk_widget_set_sensitive(basic_page.nntpauth_onconnect_checkbtn, auth);
 }
 
@@ -4846,6 +4915,16 @@ static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
        gtk_widget_set_sensitive(basic_page.smtpserv_label, !use_mailcmd);
        gtk_widget_set_sensitive(basic_page.uid_entry,  !use_mailcmd);
        gtk_widget_set_sensitive(basic_page.pass_entry, !use_mailcmd);
+       gtk_widget_set_sensitive(basic_page.showpwd_checkbtn, !use_mailcmd);
+}
+
+static void prefs_account_showpwd_checkbtn_toggled(GtkToggleButton *button,
+               gpointer user_data)
+{
+       gboolean active = gtk_toggle_button_get_active(button);
+       GtkWidget *entry = GTK_WIDGET(user_data);
+
+       gtk_entry_set_visibility(GTK_ENTRY(entry), active);
 }
 
 static void prefs_account_filter_on_recv_toggled(GtkToggleButton *button,