From e62986fa41ff6cd49eb578cac2d1a51bf2e97220 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 10 May 2015 06:39:45 +0530 Subject: [PATCH] When sending email using GMX pause for five minutes between books, to prevent GMX from blocking the account --- manual/faq.rst | 2 +- src/calibre/gui2/email.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/manual/faq.rst b/manual/faq.rst index 8045c1f7cb..d3e2cdd57b 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -480,7 +480,7 @@ programs block calibre from opening a connection to send email. Try adding an ex antivirus program. .. note:: - Microsoft/Google can disable your account if you use it to send large + Microsoft/Google/Gmx can disable your account if you use it to send large amounts of email. So, when using Hotmail/Gmail to send mail calibre automatically restricts itself to sending one book every five minutes. If you don't mind risking your account being blocked you can reduce this wait interval by going diff --git a/src/calibre/gui2/email.py b/src/calibre/gui2/email.py index 725ffaeb12..b3cebffaae 100644 --- a/src/calibre/gui2/email.py +++ b/src/calibre/gui2/email.py @@ -63,7 +63,7 @@ class Sendmail(object): opts = email_config().parse() rh = opts.relay_host if rh and ( - 'gmail.com' in rh or 'live.com' in rh): + 'gmail.com' in rh or 'live.com' in rh or 'gmx.com' in rh): self.rate_limit = tweaks['public_smtp_relay_delay'] def __call__(self, attachment, aname, to, subject, text, log=None, @@ -152,10 +152,8 @@ def email_news(mi, remove, get_fmts, done, job_manager): attachment = files[0] to_s = [account] subjects = [_('News:')+' '+mi.title] - texts = [ - _('Attached is the %s periodical downloaded by calibre.') - % (mi.title,) - ] + texts = [_( + 'Attached is the %s periodical downloaded by calibre.') % (mi.title,)] attachment_names = [ascii_filename(mi.title)+os.path.splitext(attachment)[1]] attachments = [attachment] jobnames = [mi.title]