From 26b1e9d944f8eae85cebf74ecfaac303427ecf32 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Thu, 2 Aug 2012 16:07:43 -0700
Subject: [PATCH] Add laposte.net to providers.xml

* At the request of Samsung and Laposte (France)

Bug: 6889030

Change-Id: Ib1da3c2527b69d9ca1d8d0a62f626f2ec79ea817
---
 res/xml/providers.xml | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index b28df55ae..d94cac11c 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -335,6 +335,12 @@
         <outgoing uri="smtp+ssl+://smtp.uk.aol.com" username="$user" />
     </provider>
 
+    <!-- France -->
+    <provider id="laposte" label="Laposte" domain="laposte.net">
+        <incoming uri="imap+ssl://imap.laposte.net" username="$email" />
+        <outgoing uri="smtp+ssl://smtp.laposte.net" username="$email" />
+    </provider>
+
     <!-- Germany -->
     <provider id="freenet" label="Freenet" domain="freenet.de">
         <incoming uri="pop3://mx.freenet.de" username="$user" />
@@ -354,35 +360,6 @@
         <outgoing uri="smtp://smtp.web.de" username="$user" />
     </provider>
 
-    <!-- Netherlands -->
-    <!-- TODO:  For all of these, please confirm POP3, and switch to IMAP if supported -->
-    <!-- TODO:  username="" in incoming element is broken - will not work -->
-    <!-- Disabled until username="" is resolved
-    <provider id="hetnet" label="Het Net" domain="hetnet.nl">
-        <incoming uri="pop3://pop.hetnet.nl" username="" />
-        <outgoing uri="smtp://mailhost.hetnet.nl" username="" />
-    </provider>
-    -->
-    <!-- Disabled until test accounts provided
-    <provider id="planet inet" label="Planet Internet" domain="planet.nl">
-        <incoming uri="pop3://pop.planet.nl" username="$user" />
-        <outgoing uri="smtp://mail.planet.nl" username="" />
-    </provider>
-    -->
-    <!-- TODO:  username="" in incoming element is broken - will not work -->
-    <!-- Disabled until username="" is resolved
-    <provider id="tiscali" label="Tiscali" domain="tiscali.nl">
-        <incoming uri="pop3://pop3.tiscali.nl" username="" />
-        <outgoing uri="smtp://smtp.tiscali.nl" username="" />
-    </provider>
-    -->
-    <!-- Disabled until test accounts provided
-    <provider id="wanadoo" label="Wanadoo" domain="wanadoo.nl">
-        <incoming uri="pop3://pop.wanadoo.nl" username="$user" />
-        <outgoing uri="smtp://smtp.wanadoo.nl" username="$user" />
-    </provider>
-     -->
-
     <!-- Poland -->
     <provider id="onet" label="Onet.pl" domain="poczta.onet.pl">
         <incoming uri="pop3://pop3.poczta.onet.pl" username="$email" />