From 8777dda60dc8b1d00195ec0451aa5f40edc5c2b2 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Tue, 8 Jun 2004 21:58:05 +0000 Subject: Fix for SSL options appearing for sendmail 2004-06-08 Rodney Dawes * mail-config.glade: Fix for SSL options appearing for sendmail svn path=/trunk/; revision=26263 --- mail/ChangeLog | 4 + mail/mail-config.glade | 859 +++++++++++++++++++++++++------------------------ 2 files changed, 440 insertions(+), 423 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 1802843f6b..3b0916e24d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2004-06-08 Rodney Dawes + + * mail-config.glade: Fix for SSL options appearing for sendmail + 2004-06-08 Jeffrey Stedfast * em-folder-tree.c (em_folder_tree_set_selected): Scroll to the diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 6af147cd34..967a7a6d71 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2065,45 +2065,24 @@ For example: "Work" or "Personal" True False - 6 - - - - True - <span weight="bold">Server Configuration</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - + 12 - + True False - 12 + 6 - + True - + <span weight="bold">Server Configuration</span> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -2116,106 +2095,140 @@ For example: "Work" or "Personal" - + True - 1 - 1 False - 2 - 6 + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True + 1 + 1 False - 6 + 2 + 6 - + True - 1 - 2 False - 6 - 12 + 6 - + True - _Host: - True - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - transport_host + 1 + 2 + False + 6 + 12 + + + + True + _Host: + True + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + transport_host + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + - 0 - 1 - 0 - 1 - fill - + 0 + False + True - + True True - True - True - 0 - - True - * - False + Ser_ver requires authentication + True + GTK_RELIEF_NORMAL + True + False + False + True - 1 - 2 - 0 - 1 - + 0 + False + False - 0 - False - True - - - - - - True - True - Ser_ver requires authentication - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False + 0 + 1 + 0 + 1 - 0 - 1 - 0 - 1 + 0 + True + True @@ -2232,57 +2245,23 @@ For example: "Work" or "Personal" True - - - 0 - True - True - - - - - - True - False - 6 - - - - True - <span weight="bold">Security</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - + True False - 12 + 6 - + True - + <span weight="bold">Security</span> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -2295,130 +2274,164 @@ For example: "Work" or "Personal" - + True False - 6 + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True False - 12 + 6 - + True - _Use Secure Connection (SSL): - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - transport_use_ssl - - - 0 - False - False - - + False + 12 - - - True - True - 0 + + + True + _Use Secure Connection (SSL): + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + transport_use_ssl + + + 0 + False + False + + - - + + True + True + 0 - - + + True - Always - True - - - - - True - Whenever Possible - True - - + + + True + Always + True + + - - - True - Never - True + + + True + Whenever Possible + True + + + + + + True + Never + True + + + + 0 + False + False + 0 - False - False + True + True - - - 0 - True - True - - - - - - True - False - 6 - + True - gtk-dialog-warning - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 6 - - - True - <b>SSL is not supported in this build of evolution</b> - False - True - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 + + + True + gtk-dialog-warning + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + <b>SSL is not supported in this build of evolution</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + 0 - False - False + True + True @@ -2442,57 +2455,23 @@ For example: "Work" or "Personal" True - - - 0 - True - True - - - - - - True - False - 6 - - True - <span weight="bold">Authentication</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - + True False - 12 + 6 - + True - + <span weight="bold">Authentication</span> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -2505,208 +2484,242 @@ For example: "Work" or "Personal" - + True - 1 - 1 False - 2 - 6 + 12 - + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 False - 6 + 2 + 6 - + True - 2 - 2 False - 6 - 12 - - - - True - T_ype: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - transport_auth_omenu - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - User_name: - True - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - transport_user - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - + 6 - + True + 2 + 2 False - 6 + 6 + 12 - + True - True - 0 - - - - True - - - - True - Password - True - - + T_ype: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + transport_auth_omenu + + + 0 + 1 + 0 + 1 + fill + + + - - - True - Kerberos - True - - - - + + + True + User_name: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + transport_user - 0 - False - False + 0 + 1 + 1 + 2 + fill + - + True True - Ch_eck for Supported Types - True - GTK_RELIEF_NORMAL - True + True + True + 0 + + True + * + False - 0 - False - False + 1 + 2 + 1 + 2 + - + True + False + 6 + + + + True + True + 0 + + + + True + + + + True + Password + True + + + + + + True + Kerberos + True + + + + + + + 0 + False + False + + + + + + True + True + Ch_eck for Supported Types + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + + True + + + 0 + True + True + + - 0 - True - True + 1 + 2 + 0 + 1 + fill - 1 - 2 - 0 - 1 - fill + 0 + False + True - - - 0 - False - True - - - - - True - True - Remember _password - True - GTK_RELIEF_NORMAL - True - False - False - True + + + True + True + Remember _password + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + - 0 - False - False + 0 + 1 + 0 + 1 - 0 - 1 - 0 - 1 + 0 + True + True -- cgit v1.2.3