2010-04-15 [pawel] 3.7.5cvs48

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index a8437ea265bab402e5f3e7b173705608c85204e8..de966f85e111ed4397c6d3efbc7bc4f292b768f5 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1965,7 +1965,8 @@ static void compose_create_widget_func(PrefsPage * _page,
        gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
        gtk_table_set_col_spacings (GTK_TABLE (table), 8);
 
-       autocc_checkbtn = gtk_check_button_new_with_label (_("Cc"));
+       autocc_checkbtn = gtk_check_button_new_with_label (
+                               prefs_common_translated_header_name("Cc"));
        gtk_widget_show (autocc_checkbtn);
        gtk_table_attach (GTK_TABLE (table), autocc_checkbtn, 0, 1, 0, 1,
                          GTK_FILL, 0, 0, 0);
@@ -1978,7 +1979,8 @@ static void compose_create_widget_func(PrefsPage * _page,
 
        SET_TOGGLE_SENSITIVITY (autocc_checkbtn, autocc_entry);
 
-       autobcc_checkbtn = gtk_check_button_new_with_label (_("Bcc"));
+       autobcc_checkbtn = gtk_check_button_new_with_label (
+                               prefs_common_translated_header_name("Bcc"));
        gtk_widget_show (autobcc_checkbtn);
        gtk_table_attach (GTK_TABLE (table), autobcc_checkbtn, 0, 1, 1, 2,
                          GTK_FILL, 0, 0, 0);
@@ -1991,7 +1993,8 @@ static void compose_create_widget_func(PrefsPage * _page,
 
        SET_TOGGLE_SENSITIVITY (autobcc_checkbtn, autobcc_entry);
 
-       autoreplyto_checkbtn = gtk_check_button_new_with_label (_("Reply-To"));
+       autoreplyto_checkbtn = gtk_check_button_new_with_label (
+                               prefs_common_translated_header_name("Reply-To"));
        gtk_widget_show (autoreplyto_checkbtn);
        gtk_table_attach (GTK_TABLE (table), autoreplyto_checkbtn, 0, 1, 2, 3,
                          GTK_FILL, 0, 0, 0);
@@ -2290,6 +2293,54 @@ static void privacy_create_widget_func(PrefsPage * _page,
        CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn3_data);    \
 }
 
+static void pop_ssltunnel_toggled(GtkToggleButton *button,
+                                       gpointer data)
+{
+       gboolean active = gtk_toggle_button_get_active(button);
+       
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+                       advanced_page.popport_checkbtn)) == TRUE)
+               return;
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.popport_spinbtn),
+                                 active ? 995 : 110);
+}
+
+static void imap_ssltunnel_toggled(GtkToggleButton *button,
+                                       gpointer data)
+{
+       gboolean active = gtk_toggle_button_get_active(button);
+       
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+                       advanced_page.imapport_checkbtn)) == TRUE)
+               return;
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.imapport_spinbtn),
+                                 active ? 993 : 143);
+}
+
+static void nntp_ssltunnel_toggled(GtkToggleButton *button,
+                                       gpointer data)
+{
+       gboolean active = gtk_toggle_button_get_active(button);
+       
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+                       advanced_page.nntpport_checkbtn)) == TRUE)
+               return;
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.nntpport_spinbtn),
+                                 active ? 563 : 119);
+}      
+
+static void smtp_ssltunnel_toggled(GtkToggleButton *button,
+                                       gpointer data)
+{
+       gboolean active = gtk_toggle_button_get_active(button);
+       
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+                       advanced_page.smtpport_checkbtn)) == TRUE)
+               return;
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.smtpport_spinbtn),
+                                 active ? 465 : 25);   
+}
+
 static void ssl_create_widget_func(PrefsPage * _page,
                                            GtkWindow * window,
                                            gpointer data)
@@ -2350,6 +2401,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
                             pop_starttls_radiobtn,
                             _("Use STARTTLS command to start SSL session"),
                             SSL_STARTTLS);
+       g_signal_connect(G_OBJECT(pop_ssltunnel_radiobtn), "toggled",
+                        G_CALLBACK(pop_ssltunnel_toggled), NULL);
        
        vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
 
@@ -2363,6 +2416,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
                             imap_starttls_radiobtn,
                             _("Use STARTTLS command to start SSL session"),
                             SSL_STARTTLS);
+       g_signal_connect(G_OBJECT(imap_ssltunnel_radiobtn), "toggled",
+                        G_CALLBACK(imap_ssltunnel_toggled), NULL);
 
        vbox4 = gtkut_get_options_frame(vbox1, &nntp_frame, _("NNTP"));
 
@@ -2377,6 +2432,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
 
        CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
                            _("Use SSL for NNTP connection"), SSL_TUNNEL);
+       g_signal_connect(G_OBJECT(nntp_ssltunnel_radiobtn), "toggled",
+                        G_CALLBACK(nntp_ssltunnel_toggled), NULL);
 
        vbox5 = gtkut_get_options_frame(vbox1, &send_frame, _("Send (SMTP)"));
 
@@ -2390,6 +2447,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
                             smtp_starttls_radiobtn,
                             _("Use STARTTLS command to start SSL session"),
                             SSL_STARTTLS);
+       g_signal_connect(G_OBJECT(smtp_ssltunnel_radiobtn), "toggled",
+                        G_CALLBACK(smtp_ssltunnel_toggled), NULL);
 
        PACK_FRAME(vbox1, cert_frame, _("Client certificates"));
 
@@ -4491,7 +4550,7 @@ static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
 {
        gboolean auth;
 
-       if (!GTK_WIDGET_SENSITIVE (GTK_WIDGET (button)))
+       if (!gtkut_widget_get_sensitive (GTK_WIDGET (button)))
                return;
        auth = gtk_toggle_button_get_active (button);
        gtk_widget_set_sensitive(basic_page.uid_label,  auth);