am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx

* commit '53e49db33a52cd1a270f16bc5c2b75d51ef6ffd6':
  Provider configuration for outlook, yahoo, gmx
This commit is contained in:
Régis Décamps 2014-11-02 17:38:12 +00:00 committed by Android Git Automerger
commit b678599530

View File

@ -237,7 +237,7 @@
<incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" /> <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
<outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" /> <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
</provider> </provider>
<provider id="outlook" label="Outlook" domain="outlook.com"> <provider id="outlook" label="Outlook" domain="outlook.*">
<incoming uri="eas+ssl+://m.hotmail.com" username="$email" /> <incoming uri="eas+ssl+://m.hotmail.com" username="$email" />
<outgoing uri="eas+ssl+://m.hotmail.com" username="$email" /> <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
<incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" /> <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
@ -245,7 +245,11 @@
</provider> </provider>
<!-- Yahoo! Mail variants --> <!-- Yahoo! Mail variants -->
<provider id="yahoo" label="Yahoo!" domain="yahoo.com"> <provider id="yahoo" label="Yahoo!" domain="yahoo.*">
<incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
<outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
</provider>
<provider id="yahoo1" label="Yahoo!" domain="yahoo.*.*">
<incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" /> <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
<outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" /> <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
</provider> </provider>
@ -357,7 +361,7 @@
<incoming uri="pop3://mx.freenet.de" username="$user" /> <incoming uri="pop3://mx.freenet.de" username="$user" />
<outgoing uri="smtp+ssl://mx.freenet.de" username="$email" /> <outgoing uri="smtp+ssl://mx.freenet.de" username="$email" />
</provider> </provider>
<provider id="gmx" label="GMX" domain="gmx.de"> <provider id="gmx" label="GMX" domain="gmx.*">
<incoming uri="pop3://pop.gmx.net" username="$email" /> <incoming uri="pop3://pop.gmx.net" username="$email" />
<outgoing uri="smtp://mail.gmx.net" username="$email" /> <outgoing uri="smtp://mail.gmx.net" username="$email" />
</provider> </provider>