Merge lp:~cyphermox/evolution/lp751868 into lp:~ubuntu-desktop/evolution/ubuntu

[Mathieu Trudel-Lapierre]

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-23 15:21:52 +0000
+++ debian/changelog	2011-04-05 20:01:47 +0000
@@ -1,3 +1,11 @@
+evolution (2.32.2-0ubuntu5) UNRELEASED; urgency=low
+
+  * debian/patches/99_git_ldaps_on_port_636_f0ac225.patch: Revert commit
+    8542059: it breaks connection to servers that allow only SSL, not TLS.
+    (LP: #751868)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 25 Mar 2011 18:19:39 -0400
+
 evolution (2.32.2-0ubuntu4) natty; urgency=low
 
   * debian/patches/95-git-04-express_acount_setup_5a25840.patch:
 
=== added file 'debian/patches/99_git_ldaps_on_port_636_f0ac225.patch'
--- debian/patches/99_git_ldaps_on_port_636_f0ac225.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99_git_ldaps_on_port_636_f0ac225.patch	2011-04-05 20:01:47 +0000
@@ -0,0 +1,24 @@
+From f0ac22542eb9bc90e9aed645fa6952ce3a0af8aa Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <[e-mail]>
+Date: Tue, 29 Mar 2011 18:43:27 +0000
+Subject: Revert "Bug 640083 - Cannot configure LDAPS on port 636"
+
+This reverts commit 8542059ec53e51f56ddc4b4ad720739ec075c72a.
+
+This reportedly caused a regression and does not fix the original issue.
+---
+diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
+index 6e461be..b6a8051 100644
+--- a/modules/addressbook/addressbook-config.c
++++ b/modules/addressbook/addressbook-config.c
+@@ -700,7 +700,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 {
+--
+cgit v0.9
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-23 13:41:19 +0000
+++ debian/patches/series	2011-04-05 20:01:47 +0000
@@ -28,3 +28,4 @@
 95-git-17_bcc_search_rules_06ba028.patch
 95-git-18-crash_on_contact_move_098a7ab.patch
 96_git_sent_draft_folders_wizard_setup_7215cf0.patch
+99_git_ldaps_on_port_636_f0ac225.patch