From 2152c0044c95f7fdcde94fee4f796ce2c0a5ea9e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 3 Jun 2012 14:47:45 +0530 Subject: [PATCH] Welcome wizard: Prerentially use the kindle email address set as default when more than one such address exists. Fixes #1007932 (share-by-email incorrect address selected in Welcome Wizard) --- src/calibre/gui2/wizard/__init__.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py index 7f50c13e41..ef756a226a 100644 --- a/src/calibre/gui2/wizard/__init__.py +++ b/src/calibre/gui2/wizard/__init__.py @@ -418,9 +418,17 @@ class KindlePage(QWizardPage, KindleUI): def initializePage(self): opts = smtp_prefs().parse() - for x in opts.accounts.keys(): + accs = [] + has_default = False + for x, ac in opts.accounts.iteritems(): + default = ac[2] if x.strip().endswith('@kindle.com'): - self.to_address.setText(x) + accs.append((x, default)) + if default: has_default = True + if has_default: + accs = [x for x in accs if x[1]] + if accs: + self.to_address.setText(accs[0]) def x(): t = unicode(self.to_address.text()) if t.strip():