aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2001-07-24 23:33:17 +0800
committerPeter Williams <peterw@src.gnome.org>2001-07-24 23:33:17 +0800
commit7604a13073c8f82ffd127764030af0f8ad228d1b (patch)
treecb6b6e94a410b273ad9a29bd280e30aaf80afdc3 /mail
parent7ce67731426018f637cd221527bbc260de314eee (diff)
downloadgsoc2013-evolution-7604a13073c8f82ffd127764030af0f8ad228d1b.tar
gsoc2013-evolution-7604a13073c8f82ffd127764030af0f8ad228d1b.tar.gz
gsoc2013-evolution-7604a13073c8f82ffd127764030af0f8ad228d1b.tar.bz2
gsoc2013-evolution-7604a13073c8f82ffd127764030af0f8ad228d1b.tar.lz
gsoc2013-evolution-7604a13073c8f82ffd127764030af0f8ad228d1b.tar.xz
gsoc2013-evolution-7604a13073c8f82ffd127764030af0f8ad228d1b.tar.zst
gsoc2013-evolution-7604a13073c8f82ffd127764030af0f8ad228d1b.zip
Add new label widgets with a message that SSL isn't supported.
2001-07-24 Peter Williams <peterw@ximian.com> * mail-config.glade: Add new label widgets with a message that SSL isn't supported. * mail-account-gui.h: Add a new member to the Transport GUI struct for the 'SSL is not supported' message. * mail-account-gui.c (source_type_changed): Change logic to display a message stating that SSL isn't supported if SSL isn't supported. (transport_type_changed): Same. (mail_account_gui_new): Also load the labels for the the no-SSL message. * mail-accounts.c (construct): Fix typo. svn path=/trunk/; revision=11340
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog16
-rw-r--r--mail/mail-account-gui.c22
-rw-r--r--mail/mail-account-gui.h1
-rw-r--r--mail/mail-accounts.c2
-rw-r--r--mail/mail-config.glade37
5 files changed, 70 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ba676018c7..cd6220f937 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,19 @@
+2001-07-24 Peter Williams <peterw@ximian.com>
+
+ * mail-config.glade: Add new label widgets with a message that SSL
+ isn't supported.
+
+ * mail-account-gui.h: Add a new member to the Transport GUI struct
+ for the 'SSL is not supported' message.
+
+ * mail-account-gui.c (source_type_changed): Change logic to display
+ a message stating that SSL isn't supported if SSL isn't supported.
+ (transport_type_changed): Same.
+ (mail_account_gui_new): Also load the labels for the the no-SSL
+ message.
+
+ * mail-accounts.c (construct): Fix typo.
+
2001-07-24 Not Zed <NotZed@Ximian.com>
* component-factory.c (create_folder): Dont call notifyResult here
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 6e0e09d444..d3e25a1cd3 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -335,9 +335,13 @@ source_type_changed (GtkWidget *widget, gpointer user_data)
if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL)
gtk_widget_show (GTK_WIDGET (gui->source.use_ssl));
else
-#endif
gtk_widget_hide (GTK_WIDGET (gui->source.use_ssl));
-
+ gtk_widget_hide (GTK_WIDGET (gui->source.no_ssl));
+#else
+ gtk_widget_hide (GTK_WIDGET (gui->source.use_ssl));
+ gtk_widget_show (GTK_WIDGET (gui->source.no_ssl));
+#endif
+
/* auth */
frame = glade_xml_get_widget (gui->xml, "source_auth_frame");
if (provider && CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH)) {
@@ -404,9 +408,13 @@ transport_type_changed (GtkWidget *widget, gpointer user_data)
if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL)
gtk_widget_show (GTK_WIDGET (gui->transport.use_ssl));
else
-#endif
gtk_widget_hide (GTK_WIDGET (gui->transport.use_ssl));
-
+ gtk_widget_hide (GTK_WIDGET (gui->transport.no_ssl));
+#else
+ gtk_widget_hide (GTK_WIDGET (gui->transport.use_ssl));
+ gtk_widget_show (GTK_WIDGET (gui->transport.no_ssl));
+#endif
+
/* auth */
if (CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH) &&
!CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_AUTH))
@@ -813,7 +821,7 @@ setup_service (MailAccountGuiService *gsvc, MailConfigService *service)
gboolean use_ssl = camel_url_get_param (url, "use_ssl") != NULL;
gtk_toggle_button_set_active (gsvc->use_ssl, use_ssl);
}
-
+
if (url->authmech && CAMEL_PROVIDER_ALLOWS (gsvc->provider, CAMEL_URL_PART_AUTH)) {
GList *children, *item;
CamelServiceAuthType *authtype;
@@ -1185,6 +1193,7 @@ mail_account_gui_new (MailConfigAccount *account)
gtk_signal_connect (GTK_OBJECT (gui->source.path), "changed",
GTK_SIGNAL_FUNC (service_changed), &gui->source);
gui->source.use_ssl = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "source_use_ssl"));
+ gui->source.no_ssl = glade_xml_get_widget (gui->xml, "source_ssl_disabled");
gui->source.authtype = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "source_auth_omenu"));
gui->source.remember = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "source_remember_password"));
gui->source.check_supported = GTK_BUTTON (glade_xml_get_widget (gui->xml, "source_check_supported"));
@@ -1202,6 +1211,7 @@ mail_account_gui_new (MailConfigAccount *account)
gtk_signal_connect (GTK_OBJECT (gui->transport.username), "changed",
GTK_SIGNAL_FUNC (service_changed), &gui->source);
gui->transport.use_ssl = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "transport_use_ssl"));
+ gui->transport.no_ssl = glade_xml_get_widget (gui->xml, "transport_ssl_disabled");
gui->transport_needs_auth = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "transport_needs_auth"));
gtk_signal_connect (GTK_OBJECT (gui->transport_needs_auth), "toggled", transport_needs_auth_toggled, gui);
gui->transport.authtype = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "transport_auth_omenu"));
@@ -1505,7 +1515,7 @@ save_service (MailAccountGuiService *gsvc, GHashTable *extra_config,
if (gtk_toggle_button_get_active (gsvc->use_ssl))
camel_url_set_param (url, "use_ssl", "");
}
-
+
if (extra_config)
extract_values (gsvc, extra_config, url);
diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h
index 606d716175..d428ee2546 100644
--- a/mail/mail-account-gui.h
+++ b/mail/mail-account-gui.h
@@ -43,6 +43,7 @@ typedef struct {
GtkEntry *username;
GtkEntry *path;
GtkToggleButton *use_ssl;
+ GtkWidget *no_ssl;
GtkOptionMenu *authtype;
GtkWidget *authitem;
GtkToggleButton *remember;
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 5cdb5683a2..7d08295891 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -867,7 +867,7 @@ construct (MailAccountsDialog *dialog)
gtk_signal_connect (GTK_OBJECT (dialog->prompt_bcc_only), "toggled",
GTK_SIGNAL_FUNC (prompt_bcc_only_toggled), dialog);
- dialog->thread_list = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkThreadList"));
+ dialog->thread_list = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkThreadedList"));
gtk_toggle_button_set_active (dialog->thread_list, mail_config_get_thread_list (NULL));
gtk_signal_connect (GTK_OBJECT (dialog->thread_list), "toggled",
GTK_SIGNAL_FUNC (thread_list_toggled), dialog);
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index d655b9d88b..0449e40f3b 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -780,7 +780,7 @@ None
<class>GtkTable</class>
<name>table4</name>
<border_width>3</border_width>
- <rows>4</rows>
+ <rows>5</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>3</row_spacing>
@@ -936,6 +936,28 @@ None
</widget>
<widget>
+ <class>GtkLabel</class>
+ <name>source_ssl_disabled</name>
+ <label>(SSL is not supported in this build of evolution)</label>
+ <active>False</active>
+ <sensitive>False</sensitive>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>4</top_attach>
+ <bottom_attach>5</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
<class>GnomeFileEntry</class>
<name>source_path_entry</name>
<max_saved>10</max_saved>
@@ -1368,6 +1390,19 @@ Sendmail
</widget>
<widget>
+ <class>GtkLabel</class>
+ <name>transport_ssl_disabled</name>
+ <label>(SSL is not supported in this build of evolution)</label>
+ <active>False</active>
+ <sensitive>False</sensitive>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
<class>GtkCheckButton</class>
<name>transport_needs_auth</name>
<can_focus>True</can_focus>