callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #640083 - Cannot configure LDAPS on port 636

Browse Source
This commit is contained in:
Milan Crha
2011-06-02 09:33:31 +02:00
parent 0c3aa86625
commit c5ae6cd4dd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/addressbook/addressbook-config.c
View File

@ -701,7 +701,7 @@ port_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog)
const gchar *port = gtk_entry_get_text ((GtkEntry *) w);
if (!strcmp (port, LDAPS_PORT_STRING)) {
sdialog->ssl = ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
sdialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS;
gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->ssl_combobox), sdialog->ssl);
gtk_widget_set_sensitive (sdialog->ssl_combobox, FALSE);
} else {

4
modules/addressbook/addressbook-config.h
View File

@ -42,8 +42,8 @@ typedef enum {
/* the order matches order of items in "ssl-combobox" */
typedef enum {
ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE, /* SSL */
ADDRESSBOOK_LDAP_SSL_ALWAYS, /* TLS */
ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE, /* TLS */
ADDRESSBOOK_LDAP_SSL_ALWAYS, /* SSL */
ADDRESSBOOK_LDAP_SSL_NEVER /* No encryption */
} AddressbookLDAPSSLType;

4
modules/addressbook/ldap-config.ui
View File

@ -21,10 +21,10 @@
</columns>
<data>
<row>
<col id="0" translatable="yes">SSL encryption</col>
<col id="0" translatable="yes">TLS encryption</col>
</row>
<row>
<col id="0" translatable="yes">TLS encryption</col>
<col id="0" translatable="yes">SSL encryption</col>
</row>
<row>
<col id="0" translatable="yes">No encryption</col>