aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-config.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6a0c16eb41..862d1e607a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
2008-09-01 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #448435
+
+ * gui/component/addressbook-config.c: (eabc_general_host):
+ Keep UI consistent, disable SSL method for 636 port.
+
+2008-09-01 Milan Crha <mcrha@redhat.com>
+
** Part of fix for bug #548827
* gui/widgets/eab-gui-util.c: (eab_error_dialog):
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 2b749a6dd8..978fdb21e1 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -736,6 +736,7 @@ eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
tmp = e_source_get_property (sdialog->source, "ssl");
sdialog->ssl = tmp ? ldap_parse_ssl (tmp) : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl);
+ gtk_widget_set_sensitive (sdialog->ssl_optionmenu, strcmp (port, LDAPS_PORT_STRING) != 0);
g_signal_connect(sdialog->ssl_optionmenu, "changed", G_CALLBACK(ssl_optionmenu_changed_cb), sdialog);
g_object_unref(gui);