From 74abf41837e55e8fe28c862de71ed45a99981544 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 20 Sep 2012 14:18:11 +0200
Subject: [PATCH] Correction de mail.content_disposition_type

---
 ipasserelle-gp.spec                        | 6 +++++-
 root/usr/share/mozilla-mcd/thunderbird.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ipasserelle-gp.spec b/ipasserelle-gp.spec
index 5375456..fccaa0b 100644
--- a/ipasserelle-gp.spec
+++ b/ipasserelle-gp.spec
@@ -1,4 +1,4 @@
-%define version 0.2.17
+%define version 0.2.18
 %define release 1
 %define name ipasserelle-gp
 
@@ -26,6 +26,10 @@ Ce paquet permet de gérer un parc de machines sous MS Windows
 Basé sur WPKG et d'autres outils
 
 %changelog
+* Thu Sep 20 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.18-1
+- Don't force defaultPref for some settings (use the default, either defaultPref or lockPref)
+- Lookup in LDAP using the mail address if the uid doesn't return any result
+
 * Wed Sep 12 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.17-1
 - Fix home page URL for Firefox
 
diff --git a/root/usr/share/mozilla-mcd/thunderbird.php b/root/usr/share/mozilla-mcd/thunderbird.php
index be510a9..75b2ecc 100644
--- a/root/usr/share/mozilla-mcd/thunderbird.php
+++ b/root/usr/share/mozilla-mcd/thunderbird.php
@@ -131,7 +131,7 @@ $id++;
 <?php echo $pref;?>("mail.default_html_action", 3);
 
 // Attachments
-<?php echo $pref;?>("mail.content_disposition_type ", 1);
+<?php echo $pref;?>("mail.content_disposition_type", 1);
 
 // Expunge
 <?php echo $pref;?>("mail.imap.expunge_option", 3);