2006-11-30 [colin] 2.6.0cvs69
authorColin Leroy <colin@colino.net>
Thu, 30 Nov 2006 12:43:50 +0000 (12:43 +0000)
committerColin Leroy <colin@colino.net>
Thu, 30 Nov 2006 12:43:50 +0000 (12:43 +0000)
* src/wizard.c
Put the SSL checkboxes in the receiving
and sending server pages.

ChangeLog
PATCHSETS
configure.ac
src/wizard.c

index cdde363dce4e9eef2765ce80e7ed427c3ed47c3e..9def5df80f793d7d8f8f27ea9ef81a4392cf4e0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-30 [colin]     2.6.0cvs69
+
+       * src/wizard.c
+               Put the SSL checkboxes in the receiving
+               and sending server pages.
+
 2006-11-29 [colin]     2.6.0cvs68
 
        * src/gtk/gtkutils.c
index 888c8e27289636e2c9a14207cb965171586b1257..c914b450f6246885779d2bf31d383867dc222712 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.337 -r 1.382.2.338 src/compose.c;  ) > 2.6.0cvs66.patchset
 ( cvs diff -u -r 1.36.2.89 -r 1.36.2.90 src/common/utils.c;  ) > 2.6.0cvs67.patchset
 ( cvs diff -u -r 1.5.2.43 -r 1.5.2.44 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/gtk/gtkvscrollbutton.c;  ) > 2.6.0cvs68.patchset
+( cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/wizard.c;  ) > 2.6.0cvs69.patchset
index a6bb54b6546adc04a994e6d4c0e64cc4a69f6a2e..34ef81dc3b9aad15c97f2922b61cc6c586838d07 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 1218e1d4d179624c8d4d6400b0487b59cce13e60..9bd95c241f1265db5e7bc0c21927673e402e846b 100644 (file)
@@ -75,7 +75,6 @@ int USER_PAGE = -1;
 int SMTP_PAGE = -1;
 int RECV_PAGE = -1;
 int MAILBOX_PAGE = -1;
-int SSL_PAGE = -1;
 int DONE_PAGE = -1;
 
 typedef struct
@@ -877,7 +876,11 @@ static void smtp_auth_changed (GtkWidget *btn, gpointer data)
 
 static GtkWidget* smtp_page (WizardWindow * wizard)
 {
-       GtkWidget *table = gtk_table_new(1,4, FALSE);
+#ifdef USE_OPENSSL
+       GtkWidget *table = gtk_table_new(5, 2, FALSE);
+#else
+       GtkWidget *table = gtk_table_new(4, 2, FALSE);
+#endif
        gchar *text;
        gint i = 0;
        
@@ -928,6 +931,15 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        gtk_table_attach(GTK_TABLE(table), wizard->smtp_password,             
                         1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
        i++;
+#ifdef USE_OPENSSL
+       wizard->smtp_use_ssl = gtk_check_button_new_with_label(
+                                       _("Use SSL to connect to SMTP server"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl),
+                       tmpl.smtpssl);
+       gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_ssl,      
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); 
+       i++;
+#endif
        smtp_auth_changed(NULL, wizard);
        return table;
 }
@@ -946,6 +958,9 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
                gtk_widget_hide(wizard->no_imap_warning);
+#ifdef USE_OPENSSL
+               gtk_widget_show(wizard->recv_use_ssl);
+#endif
                gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
                gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
                gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
@@ -961,6 +976,9 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
                gtk_widget_hide(wizard->no_imap_warning);
+#ifdef USE_OPENSSL
+               gtk_widget_show(wizard->recv_use_ssl);
+#endif
                gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
                gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
                gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
@@ -973,6 +991,9 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_widget_hide(wizard->recv_username_label);
                gtk_widget_hide(wizard->recv_password_label);
                gtk_widget_show(wizard->no_imap_warning);
+#ifdef USE_OPENSSL
+               gtk_widget_hide(wizard->recv_use_ssl);
+#endif
                gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, FALSE);
 #endif
        } else if (protocol == A_LOCAL) {
@@ -986,6 +1007,9 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_widget_hide(wizard->recv_password);
                gtk_widget_hide(wizard->recv_username_label);
                gtk_widget_hide(wizard->recv_password_label);
+#ifdef USE_OPENSSL
+               gtk_widget_hide(wizard->recv_use_ssl);
+#endif
                gtk_dialog_set_response_sensitive (GTK_DIALOG(wizard->window), GO_FORWARD, TRUE);
        }
 }
@@ -1002,7 +1026,11 @@ static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
 
 static GtkWidget* recv_page (WizardWindow * wizard)
 {
+#ifdef USE_OPENSSL
+       GtkWidget *table = gtk_table_new(6,2, FALSE);
+#else
        GtkWidget *table = gtk_table_new(5,2, FALSE);
+#endif
        GtkWidget *menu = gtk_menu_new();
        GtkWidget *menuitem;
        gchar *text;
@@ -1108,36 +1136,17 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        gtk_label_set_use_markup(GTK_LABEL(wizard->no_imap_warning), TRUE);
        gtk_table_attach(GTK_TABLE(table), wizard->no_imap_warning,                           
                         0,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
-       
-       return table;
-}
-
 #ifdef USE_OPENSSL
-static GtkWidget* ssl_page (WizardWindow * wizard)
-{
-       GtkWidget *table = gtk_table_new(2,2, FALSE);
-       gint i = 0;
-       
-       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-
-       wizard->smtp_use_ssl = gtk_check_button_new_with_label(
-                                       _("Use SSL to connect to SMTP server"));
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl),
-                       tmpl.smtpssl);
-       gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_ssl,      
-                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); i++;
-       
        wizard->recv_use_ssl = gtk_check_button_new_with_label(
                                        _("Use SSL to connect to receiving server"));
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->recv_use_ssl),
                        tmpl.recvssl);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_use_ssl,      
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       
+       i++;
+#endif 
        return table;
 }
-#endif
 
 static void
 wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
@@ -1332,16 +1341,6 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
                wizard->pages = g_slist_append(wizard->pages, widget);
        }
-/* ssl page: 5 */
-#ifdef USE_OPENSSL
-       i++;
-       SSL_PAGE = i;
-       widget = create_page (wizard, _("Security"));
-       gtk_box_pack_start (GTK_BOX(widget), ssl_page(wizard), FALSE, FALSE, 0);
-       PACK_WARNING(_("Bold fields must be completed"));
-       
-       wizard->pages = g_slist_append(wizard->pages, widget);
-#endif
 
 /* done page: 6 */
        i++;