sync with 0.7.6cvs20
authorPaul Mangan <paul@claws-mail.org>
Fri, 31 May 2002 07:06:28 +0000 (07:06 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 31 May 2002 07:06:28 +0000 (07:06 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/account.c
src/news.c
src/nntp.c
src/nntp.h
src/prefs_account.c

index fd6130ce8992102e3e6afd44028605dfb9136975..cb870819a6bd44d208c416392fe8b9e48a32931e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2002-05-30
+
+       * src/account.c
+         src/news.[ch]
+         src/nntp.[ch]
+         src/prefs_account.[ch]: enabled NNTP over SSL.
+       * src/nntp.c: nntp_group(): issue MODE READER command and retry
+         when GROUP command once failed (this seems to avoid problems on
+         some broken news servers).
+
+2002-05-30
+
+       * faq/it/*.html: corrected DOS linebreaks.
+       * faq/*/*.html: changed ">" to &quot;.
+
+2002-05-29
+
+       * src/prefs_account.c: prefs_account_protocol_activated(): hide
+         unnecessary frames in SSL tab.
+
 2002-05-29
 
        * src/pop.[ch]
index 7d0082999dfb7c738e17841e35026a1e62cfc440..e5c37b6059ae468b7d9a40b5786e351a54a1f987 100644 (file)
@@ -1,3 +1,8 @@
+2002-05-31 [paul]      0.7.6claws26
+
+       * sync with 0.7.6cvs20
+               see ChangeLog 2002-05-29 and 2002-05-30
+
 2002-05-31 [paul]      0.7.6claws25
 
        * src/imap.c
index 6e579f1bb7682e2528bcea12353d07a4b8f81a21..0a9601cc17cade3ec76addce39e1258fe76af6e0 100644 (file)
@@ -1,3 +1,23 @@
+2002-05-30
+
+       * src/account.c
+         src/news.[ch]
+         src/nntp.[ch]
+         src/prefs_account.[ch]: SSL ¾å¤Î NNTP ¤òÍ­¸ú¤Ë¤·¤¿¡£
+       * src/nntp.c: nntp_group(): GROUP ¥³¥Þ¥ó¥É¤¬°ìÅÙ¼ºÇÔ¤·¤¿¤È¤­¤Ë
+         MODE READER ¥³¥Þ¥ó¥É¤òȯ¹Ô¤·¤ÆºÆ»î¹Ô¤¹¤ë¤è¤¦¤Ë¤·¤¿(broken ¤Ê
+         ¥Ë¥å¡¼¥¹¥µ¡¼¥Ð¤Ç¤ÎÌäÂê¤ò²óÈò¤Ç¤­¤ë¤é¤·¤¤)¡£
+
+2002-05-30
+
+       * faq/it/*.html: DOS ²þ¹Ô¤ò½¤Àµ¡£
+       * faq/*/*.html: ">" ¤ò &quot; ¤ËÊѹ¹¡£
+
+2002-05-29
+
+       * src/prefs_account.c: prefs_account_protocol_activated(): SSL ¥¿¥Ö
+         ¤ÎÉÔÍפʥե졼¥à¤ò±£¤¹¤è¤¦¤Ë¤·¤¿¡£
+
 2002-05-29
 
        * src/pop.[ch]
index a6574bf7071e684c21fa6c9b27ae285c3a40e615..6e347b9062ba21bbdeee5c32d951668293a35ecc 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 47a980dfcbc02b88e6dafb296bf0183be5d7a8af..108247e8edc925d7364ab6903149d40643d07957 100644 (file)
@@ -810,8 +810,10 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
                              "IMAP4 (SSL)" :
                              ac_prefs->ssl_imap == SSL_STARTTLS ?
                              "IMAP4 (TLS)" : "IMAP4") :
-                            ac_prefs->protocol == A_NNTP ? 
-                                 (ac_prefs->ssl_nntp ? "NNTP (SSL)"  :  "NNTP") : "";
+                            ac_prefs->protocol == A_NNTP ?
+                            (ac_prefs->ssl_nntp == SSL_TUNNEL ?
+                             "NNTP (SSL)" : "NNTP") :
+                            "";
 #else
        text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? "POP3" :
                             ac_prefs->protocol == A_APOP  ? "POP3 (APOP)" :
index c0b14c49cba2107b5db350aa2c5056731c72d0a7..37c2d4f4d6357425adea49c06f21139cbef5b88d 100644 (file)
 #include "prefs_account.h"
 #include "inputdialog.h"
 #include "alertpanel.h"
+#if USE_SSL
+#  include "ssl.h"
+#endif
 
 #define NNTP_PORT      119
 #if USE_SSL
-#include "ssl.h"
-#define NNTPS_PORT 563
+#define NNTPS_PORT     563
 #endif
 
 static void news_folder_init            (Folder        *folder,
@@ -62,7 +64,8 @@ static void news_folder_init           (Folder        *folder,
 static Session *news_session_new        (const gchar   *server,
                                          gushort        port,
                                          const gchar   *userid,
-                                         const gchar   *passwd, SSLType ssl_type);
+                                         const gchar   *passwd,
+                                         SSLType        ssl_type);
 #else
 static Session *news_session_new        (const gchar   *server,
                                          gushort        port,
@@ -133,7 +136,8 @@ static void news_folder_init(Folder *folder, const gchar *name,
 
 #if USE_SSL
 static Session *news_session_new(const gchar *server, gushort port,
-                                const gchar *userid, const gchar *passwd, SSLType ssl_type)
+                                const gchar *userid, const gchar *passwd,
+                                SSLType ssl_type)
 #else
 static Session *news_session_new(const gchar *server, gushort port,
                                 const gchar *userid, const gchar *passwd)
@@ -147,16 +151,16 @@ static Session *news_session_new(const gchar *server, gushort port,
 
        log_message(_("creating NNTP connection to %s:%d ...\n"), server, port);
 
-       if (userid && passwd)
 #if USE_SSL
-               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd, ssl_type);
-#else
-               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
-#endif
+       if (userid && passwd)
+               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd,
+                                          ssl_type);
        else
-#if USE_SSL
                nntp_sock = nntp_open(server, port, buf, ssl_type);
 #else
+       if (userid && passwd)
+               nntp_sock = nntp_open_auth(server, port, buf, userid, passwd);
+       else
                nntp_sock = nntp_open(server, port, buf);
 #endif
 
@@ -192,22 +196,12 @@ static Session *news_session_new_for_folder(Folder *folder)
        PrefsAccount *ac;
        const gchar *userid = NULL;
        gchar *passwd = NULL;
-       int port;
+       gushort port;
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
 
        ac = folder->account;
-
-#if USE_SSL
-       if (ac->set_nntpport) {
-                port = ac->nntpport;
-       } else {
-                port = ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
-       }
-#else
-       port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
-#endif
        if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
                userid = ac->userid;
                if (ac->passwd && ac->passwd[0])
@@ -218,14 +212,15 @@ static Session *news_session_new_for_folder(Folder *folder)
        }
 
 #if USE_SSL
-       session = news_session_new(ac->nntp_server,
-                                  port, 
-                                  userid, passwd, ac->ssl_nntp);
+       port = ac->set_nntpport ? ac->nntpport
+               : ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
+       session = news_session_new(ac->nntp_server, port, userid, passwd,
+                                  ac->ssl_nntp);
 #else
-       session = news_session_new(ac->nntp_server,
-                                  port, 
-                                  userid, passwd);
+       port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
+       session = news_session_new(ac->nntp_server, port, userid, passwd);
 #endif
+
        g_free(passwd);
 
        return session;
index b28065d1b9a34ce54c9d2c931052d07e07a020d6..bc59ce06f1244eb7b7680a2227ab1e706fa1aaea 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "intl.h"
 #include "nntp.h"
 #include "socket.h"
-#include "ssl.h"
 #include "utils.h"
+#if USE_SSL
+#  include "ssl.h"
+#endif
 
 static gint verbose = 1;
 
@@ -45,7 +47,8 @@ static gint nntp_gen_command  (NNTPSockInfo   *sock,
                                 ...);
 
 #if USE_SSL
-NNTPSockInfo *nntp_open(const gchar *server, gushort port, gchar *buf, SSLType ssl_type)
+NNTPSockInfo *nntp_open(const gchar *server, gushort port, gchar *buf,
+                       SSLType ssl_type)
 #else
 NNTPSockInfo *nntp_open(const gchar *server, gushort port, gchar *buf)
 #endif
@@ -60,12 +63,12 @@ NNTPSockInfo *nntp_open(const gchar *server, gushort port, gchar *buf)
        }
 
 #if USE_SSL
-       if (ssl_type && !ssl_init_socket(sock)) {
-                sock_close(sock);
-                return NULL;
+       if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
+               sock_close(sock);
+               return NULL;
        }
 #endif
-       
+
        nntp_sock = g_new0(NNTPSockInfo, 1);
        nntp_sock->sock = sock;
 
@@ -80,7 +83,8 @@ NNTPSockInfo *nntp_open(const gchar *server, gushort port, gchar *buf)
 
 #if USE_SSL
 NNTPSockInfo *nntp_open_auth(const gchar *server, gushort port, gchar *buf,
-                            const gchar *userid, const gchar *passwd, SSLType ssl_type)
+                            const gchar *userid, const gchar *passwd,
+                            SSLType ssl_type)
 #else
 NNTPSockInfo *nntp_open_auth(const gchar *server, gushort port, gchar *buf,
                             const gchar *userid, const gchar *passwd)
@@ -122,10 +126,11 @@ gint nntp_group(NNTPSockInfo *sock, const gchar *group,
        ok = nntp_gen_command(sock, buf, "GROUP %s", group);
 
        if (ok != NN_SUCCESS) {
-               ok = nntp_gen_command(sock, buf, "MODE READER");
+               ok = nntp_mode(sock, FALSE);
                if (ok == NN_SUCCESS)
                        ok = nntp_gen_command(sock, buf, "GROUP %s", group);
-       }       
+       }
+
        if (ok != NN_SUCCESS)
                return ok;
 
index 54c852e1d65a5d9171f981ec28090c4e024f53c1..62e68ce54e4d92bab3b421a12ff3e0a4d97667a8 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +21,8 @@
 #define __NNTP_H__
 
 #include "socket.h"
-
 #if USE_SSL
-#include "ssl.h"
+#  include "ssl.h"
 #endif
 
 typedef struct _NNTPSockInfo   NNTPSockInfo;
@@ -53,21 +52,17 @@ struct _NNTPSockInfo
 NNTPSockInfo *nntp_open                (const gchar    *server,
                                 gushort         port,
                                 gchar          *buf,
-                                SSLType        ssl_type);
-#else
-NNTPSockInfo *nntp_open                (const gchar    *server,
-                                gushort         port,
-                                gchar          *buf);
-#endif
-
-#if USE_SSL
+                                SSLType         ssl_type);
 NNTPSockInfo *nntp_open_auth   (const gchar    *server,
                                 gushort         port,
                                 gchar          *buf,
                                 const gchar    *userid,
                                 const gchar    *passwd,
-                                SSLType        ssl_type);
+                                SSLType         ssl_type);
 #else
+NNTPSockInfo *nntp_open                (const gchar    *server,
+                                gushort         port,
+                                gchar          *buf);
 NNTPSockInfo *nntp_open_auth   (const gchar    *server,
                                 gushort         port,
                                 gchar          *buf,
index ffce665ae4952fd7c729e860c876e62cd9d18cba..f3eb9812d77aed23c925b2386d51a58026e6f775 100644 (file)
@@ -140,16 +140,15 @@ static struct SSLPrefs {
        GtkWidget *pop_ssltunnel_radiobtn;
        GtkWidget *pop_starttls_radiobtn;
 
-       GtkWidget *nntp_frame;
-       GtkWidget *nntp_nossl_radiobtn;
-       GtkWidget *nntp_ssltunnel_radiobtn;
-       GtkWidget *nntp_starttls_radiobtn;
-
        GtkWidget *imap_frame;
        GtkWidget *imap_nossl_radiobtn;
        GtkWidget *imap_ssltunnel_radiobtn;
        GtkWidget *imap_starttls_radiobtn;
 
+       GtkWidget *nntp_frame;
+       GtkWidget *nntp_nossl_radiobtn;
+       GtkWidget *nntp_ssltunnel_radiobtn;
+
        GtkWidget *send_frame;
        GtkWidget *smtp_nossl_radiobtn;
        GtkWidget *smtp_ssltunnel_radiobtn;
@@ -343,7 +342,6 @@ static PrefParam param[] = {
 
        {"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING,
         &compose.autoreplyto_entry,
-
         prefs_set_data_from_entry, prefs_set_entry},
 
 #if USE_GPGME
@@ -376,15 +374,14 @@ static PrefParam param[] = {
         &ssl.imap_nossl_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
+       {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
+        &ssl.nntp_nossl_radiobtn,
+        prefs_account_enum_set_data_from_radiobtn,
+        prefs_account_enum_set_radiobtn},
        {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
         &ssl.smtp_nossl_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
-       {"ssl_nntp", "FALSE", &tmp_ac_prefs.ssl_nntp, P_BOOL,
-        &ssl.nntp_nossl_radiobtn,
-       prefs_account_enum_set_data_from_radiobtn,
-        prefs_account_enum_set_radiobtn},
-
 #endif /* USE_SSL */
 
        /* Advanced */
@@ -1492,6 +1489,16 @@ static void prefs_account_ascii_armored_warning(GtkWidget* widget,
 
 #if USE_SSL
 
+#define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data)              \
+{                                                                      \
+       btn = gtk_radio_button_new_with_label_from_widget               \
+               (GTK_RADIO_BUTTON (btn_p), label);                      \
+       gtk_widget_show (btn);                                          \
+       gtk_box_pack_start (GTK_BOX (box), btn, FALSE, FALSE, 0);       \
+       gtk_object_set_user_data (GTK_OBJECT (btn),                     \
+                                 GINT_TO_POINTER (data));              \
+}
+
 #define CREATE_RADIO_BUTTONS(box,                                      \
                             btn1, btn1_label, btn1_data,               \
                             btn2, btn2_label, btn2_data,               \
@@ -1503,19 +1510,8 @@ static void prefs_account_ascii_armored_warning(GtkWidget* widget,
        gtk_object_set_user_data (GTK_OBJECT (btn1),                    \
                                  GINT_TO_POINTER (btn1_data));         \
                                                                        \
-       btn2 = gtk_radio_button_new_with_label_from_widget              \
-               (GTK_RADIO_BUTTON (btn1), btn2_label);                  \
-       gtk_widget_show (btn2);                                         \
-       gtk_box_pack_start (GTK_BOX (box), btn2, FALSE, FALSE, 0);      \
-       gtk_object_set_user_data (GTK_OBJECT (btn2),                    \
-                                 GINT_TO_POINTER (btn2_data));         \
-                                                                       \
-       btn3 = gtk_radio_button_new_with_label_from_widget              \
-               (GTK_RADIO_BUTTON (btn1), btn3_label);                  \
-       gtk_widget_show (btn3);                                         \
-       gtk_box_pack_start (GTK_BOX (box), btn3, FALSE, FALSE, 0);      \
-       gtk_object_set_user_data (GTK_OBJECT (btn3),                    \
-                                 GINT_TO_POINTER (btn3_data));         \
+       CREATE_RADIO_BUTTON(box, btn2, btn1, btn2_label, btn2_data);    \
+       CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn2_data);    \
 }
 
 static void prefs_account_ssl_create(void)
@@ -1538,7 +1534,6 @@ static void prefs_account_ssl_create(void)
        GtkWidget *vbox4;
        GtkWidget *nntp_nossl_radiobtn;
        GtkWidget *nntp_ssltunnel_radiobtn;
-       GtkWidget *nntp_starttls_radiobtn;
 
        GtkWidget *send_frame;
        GtkWidget *vbox5;
@@ -1591,16 +1586,16 @@ static void prefs_account_ssl_create(void)
        gtk_container_add (GTK_CONTAINER (nntp_frame), vbox4);
        gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8);
 
-       CREATE_RADIO_BUTTONS(vbox4,
-                            nntp_nossl_radiobtn,
-                            _("Don't use SSL"),
-                            SSL_NONE,
-                            nntp_ssltunnel_radiobtn,
-                            _("Use SSL for NNTP connection"),
-                            SSL_TUNNEL,
-                            nntp_starttls_radiobtn,
-                            _("Use STARTTLS command to start SSL session"),
-                            SSL_STARTTLS);
+       nntp_nossl_radiobtn =
+               gtk_radio_button_new_with_label (NULL, _("Don't use SSL"));
+       gtk_widget_show (nntp_nossl_radiobtn);
+       gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
+                           FALSE, FALSE, 0);
+       gtk_object_set_user_data (GTK_OBJECT (nntp_nossl_radiobtn),
+                                 GINT_TO_POINTER (SSL_NONE));
+
+       CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
+                           _("Use SSL for NNTP connection"), SSL_TUNNEL);
 
        PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
        vbox5 = gtk_vbox_new (FALSE, 0);
@@ -1632,7 +1627,6 @@ static void prefs_account_ssl_create(void)
        ssl.nntp_frame              = nntp_frame;
        ssl.nntp_nossl_radiobtn     = nntp_nossl_radiobtn;
        ssl.nntp_ssltunnel_radiobtn = nntp_ssltunnel_radiobtn;
-       ssl.nntp_starttls_radiobtn  = nntp_starttls_radiobtn;
 
        ssl.send_frame              = send_frame;
        ssl.smtp_nossl_radiobtn     = smtp_nossl_radiobtn;
@@ -1641,6 +1635,7 @@ static void prefs_account_ssl_create(void)
 }
 
 #undef CREATE_RADIO_BUTTONS
+#undef CREATE_RADIO_BUTTON
 #endif /* USE_SSL */
 
 static void crosspost_color_toggled(void)
@@ -2163,17 +2158,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #if USE_SSL
-               gtk_widget_set_sensitive(ssl.pop_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.imap_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.nntp_frame, TRUE);
-               gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+               gtk_widget_hide(ssl.pop_frame);
+               gtk_widget_hide(ssl.imap_frame);
+               gtk_widget_show(ssl.nntp_frame);
+               gtk_widget_hide(ssl.send_frame);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_show(advanced.nntpport_hbox);
                gtk_widget_show(advanced.crosspost_chkbtn);
                gtk_widget_show(advanced.crosspost_colormenu);
-               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
+               gtk_widget_hide(advanced.imap_frame);
                break;
        case A_LOCAL:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2226,17 +2221,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #if USE_SSL
-               gtk_widget_set_sensitive(ssl.pop_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.imap_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.nntp_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+               gtk_widget_hide(ssl.pop_frame);
+               gtk_widget_hide(ssl.imap_frame);
+               gtk_widget_hide(ssl.nntp_frame);
+               gtk_widget_show(ssl.send_frame);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
                gtk_widget_hide(advanced.crosspost_chkbtn);
                gtk_widget_hide(advanced.crosspost_colormenu);
-               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
+               gtk_widget_hide(advanced.imap_frame);
                break;
        case A_IMAP4:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2291,17 +2286,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #if USE_SSL
-               gtk_widget_set_sensitive(ssl.pop_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.imap_frame, TRUE);
-               gtk_widget_set_sensitive(ssl.nntp_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+               gtk_widget_hide(ssl.pop_frame);
+               gtk_widget_show(ssl.imap_frame);
+               gtk_widget_hide(ssl.nntp_frame);
+               gtk_widget_show(ssl.send_frame);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_show(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
                gtk_widget_hide(advanced.crosspost_chkbtn);
                gtk_widget_hide(advanced.crosspost_colormenu);
-               gtk_widget_set_sensitive(advanced.imap_frame, TRUE);
+               gtk_widget_show(advanced.imap_frame);
                break;
        case A_POP3:
        default:
@@ -2357,17 +2352,17 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                }
 
 #if USE_SSL
-               gtk_widget_set_sensitive(ssl.pop_frame, TRUE);
-               gtk_widget_set_sensitive(ssl.imap_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.nntp_frame, FALSE);
-               gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+               gtk_widget_show(ssl.pop_frame);
+               gtk_widget_hide(ssl.imap_frame);
+               gtk_widget_hide(ssl.nntp_frame);
+               gtk_widget_show(ssl.send_frame);
 #endif
                gtk_widget_show(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
                gtk_widget_hide(advanced.crosspost_chkbtn);
                gtk_widget_hide(advanced.crosspost_colormenu);
-               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
+               gtk_widget_hide(advanced.imap_frame);
                break;
        }