[evolution/gnome-3-0] Bug #640083 - Cannot configure LDAPS on port 636

[Milan Crha <mcrha src gnome org>]

commit 069e2f8aaf9ab9d88cf6821555b6a166102cad71
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 2 09:34:18 2011 +0200

    Bug #640083 - Cannot configure LDAPS on port 636

 modules/addressbook/addressbook-config.c |    2 +-
 modules/addressbook/addressbook-config.h |    4 ++--
 modules/addressbook/ldap-config.ui       |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index c7f1db5..1876762 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -699,7 +699,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 aaf791d..d9fefb7 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 4d045f5..8756c4a 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>