From be196577cfbb01bdd58afbe1fb287aae1d8e2397 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 6 Feb 2014 17:59:13 +0100
Subject: [PATCH] Do not hardcode defaultPref, use the global pref style
 (either defaultPref or lockPref)

---
 root/usr/share/mozilla-mcd/thunderbird.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/root/usr/share/mozilla-mcd/thunderbird.php b/root/usr/share/mozilla-mcd/thunderbird.php
index e5b3308..b7c75fe 100644
--- a/root/usr/share/mozilla-mcd/thunderbird.php
+++ b/root/usr/share/mozilla-mcd/thunderbird.php
@@ -124,15 +124,15 @@ for ($i=0; $i < count($user[0]['mail'])-1; $i++){
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.smtpServer", "smtp1");
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.useremail", "<?php echo $user[0]['mail'][$i]; ?>");
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.valid", true);
-defaultPref("mail.identity.id<?php echo $id; ?>.fcc_folder_pickup_mode", "1");
-defaultPref("mail.identity.id<?php echo $id; ?>.fcc_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Sent");
-defaultPref("mail.identity.id<?php echo $id; ?>.drafts_folder_pickup_mode", "1");
-defaultPref("mail.identity.id<?php echo $id; ?>.draft_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Drafts");
-defaultPref("mail.identity.id<?php echo $id; ?>.templ_folder_pickup_mode", "1");
-defaultPref("mail.identity.id<?php echo $id; ?>.stationery_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Templates");
-defaultPref("mail.identity.id<?php echo $id; ?>.reply_on_top", 1);
-defaultPref("mail.identity.id<?php echo $id; ?>.attach_signature", true);
-defaultPref("mail.identity.id<?php echo $id; ?>.sig_file", path_profile+path_sep+"signature"+path_sep+"email.html");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.fcc_folder_pickup_mode", "1");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.fcc_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Sent");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.drafts_folder_pickup_mode", "1");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.draft_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Drafts");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.templ_folder_pickup_mode", "1");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.stationery_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Templates");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.reply_on_top", 1);
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.attach_signature", true);
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.sig_file", path_profile+path_sep+"signature"+path_sep+"email.html");
 <?php
 $identities .= ',id' . $id;
 $account++;