← Back to branch summary

~cyphermox/ubuntu/raring/evolution/3.6.4

« back to all changes in this revision

Viewing changes to debian/patches/99_git_ldaps_on_port_636_f0ac225.patch

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-09-26 12:24:40 UTC
  • mfrom: (1.1.86 upstream)
  • Revision ID: package-import@ubuntu.com-20110926122440-nn0pyj1yj4j0k784
Tags: 3.2.0-0ubuntu1
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.2.0. 
* debian/patches/*git*.patch: remove left over patches we already no longer
  apply.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/99_git_ldaps_on_port_636_f0ac225.patch
1
 
From f0ac22542eb9bc90e9aed645fa6952ce3a0af8aa Mon Sep 17 00:00:00 2001
2
 
From: Matthew Barnes <mbarnes@redhat.com>
3
 
Date: Tue, 29 Mar 2011 18:43:27 +0000
4
 
Subject: Revert "Bug 640083 - Cannot configure LDAPS on port 636"
5
 
 
6
 
This reverts commit 8542059ec53e51f56ddc4b4ad720739ec075c72a.
7
 
 
8
 
This reportedly caused a regression and does not fix the original issue.
9
 
---
10
 
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
11
 
index 6e461be..b6a8051 100644
12
 
--- a/modules/addressbook/addressbook-config.c
13
 
+++ b/modules/addressbook/addressbook-config.c
14
 
@@ -700,7 +700,7 @@ port_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog)
15
 
        const gchar *port = gtk_entry_get_text ((GtkEntry *)w);
16
 
 
17
 
        if (!strcmp (port, LDAPS_PORT_STRING)) {
18
 
-               sdialog->ssl = ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;
19
 
+               sdialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS;
20
 
                gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->ssl_combobox), sdialog->ssl);
21
 
                gtk_widget_set_sensitive (sdialog->ssl_combobox, FALSE);
22
 
        } else {
23
 
--
24
 
cgit v0.9