aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-06-02 15:33:31 +0800
committerMilan Crha <mcrha@redhat.com>2011-06-02 15:33:31 +0800
commitc5ae6cd4ddebfb3aaa3557938d261c6c57f422a4 (patch)
tree3d656dd70c9a5c0f7b62bee7517225fff7e90c2a
parent0c3aa866257c2c8f48ac38055aee7c602c2f9e48 (diff)
downloadgsoc2013-evolution-c5ae6cd4ddebfb3aaa3557938d261c6c57f422a4.tar
gsoc2013-evolution-c5ae6cd4ddebfb3aaa3557938d261c6c57f422a4.tar.gz
gsoc2013-evolution-c5ae6cd4ddebfb3aaa3557938d261c6c57f422a4.tar.bz2
gsoc2013-evolution-c5ae6cd4ddebfb3aaa3557938d261c6c57f422a4.tar.lz
gsoc2013-evolution-c5ae6cd4ddebfb3aaa3557938d261c6c57f422a4.tar.xz
gsoc2013-evolution-c5ae6cd4ddebfb3aaa3557938d261c6c57f422a4.tar.zst
gsoc2013-evolution-c5ae6cd4ddebfb3aaa3557938d261c6c57f422a4.zip
Bug #640083 - Cannot configure LDAPS on port 636
-rw-r--r--modules/addressbook/addressbook-config.c2
-rw-r--r--modules/addressbook/addressbook-config.h4
-rw-r--r--modules/addressbook/ldap-config.ui4
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 9c48c9de8c..f39fa79426 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -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 {
diff --git a/modules/addressbook/addressbook-config.h b/modules/addressbook/addressbook-config.h
index aaf791d487..d9fefb7e82 100644
--- a/modules/addressbook/addressbook-config.h
+++ b/modules/addressbook/addressbook-config.h
@@ -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;
diff --git a/modules/addressbook/ldap-config.ui b/modules/addressbook/ldap-config.ui
index 4d045f51a1..8756c4a588 100644
--- a/modules/addressbook/ldap-config.ui
+++ b/modules/addressbook/ldap-config.ui
@@ -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>